Module: Mesa Branch: master Commit: bddb6c7a383682d0f8f4fadd8cf57472a8c3c8a8 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bddb6c7a383682d0f8f4fadd8cf57472a8c3c8a8
Author: Török Edwin <edwinto...@gmail.com> Date: Fri Apr 9 20:05:47 2010 +0300 Fix build with --enable-32-bit. CFLAGS needs to be passed, as you already know. Commit 3e17a5b047124c46ee45dbd1848127c67e0d62f3 broke this by adding a new link command without CFLAGS. Signed-off-by: Török Edwin <edwinto...@gmail.com> Signed-off-by: Dan Nicholson <dbn.li...@gmail.com> --- src/gallium/targets/Makefile.dri | 2 +- src/mesa/drivers/dri/Makefile.template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/targets/Makefile.dri b/src/gallium/targets/Makefile.dri index 6d9b81a..16477e3 100644 --- a/src/gallium/targets/Makefile.dri +++ b/src/gallium/targets/Makefile.dri @@ -69,7 +69,7 @@ $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(PIPE_DRIVERS) Makefile \ $(OBJECTS) $(PIPE_DRIVERS) \ -Wl,--start-group $(MESA_MODULES) -Wl,--end-group \ $(DRI_LIB_DEPS) $(DRIVER_EXTRAS) - $(CC) -o $...@.test $(TOP)/src/mesa/drivers/dri/common/dri_test.o $...@.tmp $(DRI_LIB_DEPS) + $(CC) $(CFLAGS) -o $...@.test $(TOP)/src/mesa/drivers/dri/common/dri_test.o $...@.tmp $(DRI_LIB_DEPS) @rm -f $...@.test mv -f $...@.tmp $@ diff --git a/src/mesa/drivers/dri/Makefile.template b/src/mesa/drivers/dri/Makefile.template index f19cc03..4cdd51e 100644 --- a/src/mesa/drivers/dri/Makefile.template +++ b/src/mesa/drivers/dri/Makefile.template @@ -54,7 +54,7 @@ $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) Makefile \ $(TOP)/src/mesa/drivers/dri/Makefile.template $(TOP)/src/mesa/drivers/dri/common/dri_test.o $(MKLIB) -o $...@.tmp -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \ $(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) $(DRI_LIB_DEPS) - $(CC) -o $...@.test $(TOP)/src/mesa/drivers/dri/common/dri_test.o $...@.tmp $(DRI_LIB_DEPS) + $(CC) $(CFLAGS) -o $...@.test $(TOP)/src/mesa/drivers/dri/common/dri_test.o $...@.tmp $(DRI_LIB_DEPS) @rm -f $...@.test mv -f $...@.tmp $@ _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit