diff options
| author | Thomas Gstädtner <thomas@gstaedtner.net> | 2012-05-23 18:55:51 +0200 |
|---|---|---|
| committer | Jakob Bornecrantz <jakob@vmware.com> | 2012-06-27 20:01:47 +0200 |
| commit | f8ebc4a9e843adad05be545d3aa5eaac65823172 (patch) | |
| tree | db4f868f39dda0ef1b726512f050fd05e45688bd | |
| parent | 488e22aaf0864a496316c893d3b2c8787d7149d3 (diff) | |
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 |