progs/glsl: Ensure CFLAGS are passed during linking

Commit ab6825b3e3 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 <dbn.lists@gmail.com>
Tested-by: Török Edwin <edwintorok@gmail.com>
This commit is contained in:
Dan Nicholson
2010-02-26 10:01:37 -08:00
parent 88c174d182
commit 3a650ba3a2

View File

@@ -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 *~