diff options
| author | Thomas Gstädtner <thomas@gstaedtner.net> | 2012-05-23 18:55:51 +0200 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2012-07-06 10:09:00 -0700 |
| commit | 0d384680988cc3a9a7b69793f5f46971bbd5210a (patch) | |
| tree | e7d6e05657944b98da5fd1012972405ba195a951 | |
| parent | fc3d2c46239af5c57f90643408586345b5561360 (diff) | |
| download | mesa-0d384680988cc3a9a7b69793f5f46971bbd5210a.tar.gz | |
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 <thomas@gstaedtner.net>
Signed-off-by: Brian Paul <brianp@vmware.com>
(cherry picked from commit 93594f38be75227879b835a2037b7466adbd70ef)
| -rw-r--r-- | 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 481e3d6a2b7..21bf2373bf0 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 |