Module: Mesa Branch: master Commit: 3a650ba3a2f6ec23f74ff602bafd4d8bf3c35d45 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3a650ba3a2f6ec23f74ff602bafd4d8bf3c35d45
Author: Dan Nicholson <[email protected]> Date: Fri Feb 26 10:01:37 2010 -0800 progs/glsl: Ensure CFLAGS are passed during linking Commit ab6825b3e3fd04564b7840e945fa32b0a7b3c0c2 fixed an issue where the architecture option -m32 wasn't being passed to the compiler when linking .o files. This would only fix the issue with user's building with the hacky --enable-32-bit. The right way to fix this is to pass CFLAGS to the linker, which the GNU make builtin rules unfortunately don't do. Signed-off-by: Dan Nicholson <[email protected]> Tested-by: Török Edwin <[email protected]> --- progs/glsl/Makefile | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/progs/glsl/Makefile b/progs/glsl/Makefile index aaa54cb..3b5a595 100644 --- a/progs/glsl/Makefile +++ b/progs/glsl/Makefile @@ -16,7 +16,7 @@ LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) \ # using : to avoid APP_CC pointing to CC loop CC := $(APP_CC) CFLAGS := -I$(INCDIR) $(CFLAGS) -LDLIBS = $(LIBS) $(ARCH_FLAGS) +LDLIBS = $(LIBS) PROG_SOURCES = \ array.c \ @@ -69,6 +69,9 @@ $(PROG_OBJS): $(UTIL_HEADERS) $(PROGS): $(UTIL_OBJS) +.o: + $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@ + clean: -rm -f $(PROGS) -rm -f *.o *~ _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
