diff options
| author | Dan Nicholson <[email protected]> | 2010-02-26 10:01:37 -0800 |
|---|---|---|
| committer | Dan Nicholson <[email protected]> | 2010-02-26 11:05:54 -0800 |
| commit | 3a650ba3a2f6ec23f74ff602bafd4d8bf3c35d45 (patch) | |
| tree | 47af2cc61ac40af1a31afe03d5dd47103eba1810 /progs | |
| parent | 88c174d182139e9433db70b81393276250c8ee20 (diff) | |
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]>
Diffstat (limited to 'progs')
| -rw-r--r-- | progs/glsl/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/progs/glsl/Makefile b/progs/glsl/Makefile index aaa54cbe71a..3b5a5959aee 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 *~ |