Module: Mesa
Branch: master
Commit: 93594f38be75227879b835a2037b7466adbd70ef
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=93594f38be75227879b835a2037b7466adbd70ef
Author: Thomas Gstädtner <tho...@gstaedtner.net>
Date: Wed May 23 18:55:51 2012 +0200
gallium/targets: pass ldflags parameter to MKLIB
Without passing the -ldflags parameter before $(LDFLAGS) in some cases
flags will be passed to MKLIB which it does not understand.
This might be -m64, -m32 or similar.
NOTE: This is a candidate for the 8.0 branch.
Signed-off-by: Thomas Gstädtner <tho...@gstaedtner.net>
Signed-off-by: Brian Paul <bri...@vmware.com>
---
src/gallium/targets/Makefile.xorg | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/gallium/targets/Makefile.xorg
b/src/gallium/targets/Makefile.xorg
index 481e3d6..21bf237 100644
--- a/src/gallium/targets/Makefile.xorg
+++ b/src/gallium/targets/Makefile.xorg
@@ -46,7 +46,7 @@ endif
default: depend $(TOP)/$(LIB_DIR)/gallium $(LIBNAME) $(LIBNAME_STAGING)
$(LIBNAME): $(OBJECTS) Makefile ../Makefile.xorg $(LIBS) $(DRIVER_PIPES)
$(GALLIUM_AUXILIARIES)
- $(MKLIB) -linker '$(LD)' -noprefix -o $@ $(LDFLAGS) $(OBJECTS)
$(DRIVER_PIPES) $(GALLIUM_AUXILIARIES) $(DRIVER_LINKS)
+ $(MKLIB) -linker '$(LD)' -noprefix -o $@ -ldflags '$(LDFLAGS)'
$(OBJECTS) $(DRIVER_PIPES) $(GALLIUM_AUXILIARIES) $(DRIVER_LINKS)
depend: $(C_SOURCES) $(CPP_SOURCES) $(ASM_SOURCES) $(SYMLINKS)
$(GENERATED_SOURCES)
rm -f depend
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
