diff options
author | Guillaume Melquiond <guillaume.melquiond@gmail.com> | 2008-07-30 07:56:42 -0700 |
---|---|---|
committer | Dan Nicholson <dbn.lists@gmail.com> | 2008-07-30 07:56:42 -0700 |
commit | 3e8e292db0794a4d2dda1605f86e8f71dbf1d661 (patch) | |
tree | 084bc2e62e84afa95df02a4897cc7f0449164921 /progs/trivial | |
parent | b068ab62a0433b6a92374c83f153b3c9ac4b4e5e (diff) |
Always pass CFLAGS when compiling or linking demos
To ensure that the correct architecture flags are used, always pass the
user's CFLAGS when compiling or linking the demos. Fixes #16860.
Diffstat (limited to 'progs/trivial')
-rw-r--r-- | progs/trivial/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/progs/trivial/Makefile b/progs/trivial/Makefile index 6fa51ce2cf..e72fb07889 100644 --- a/progs/trivial/Makefile +++ b/progs/trivial/Makefile @@ -115,13 +115,13 @@ getproclist.h: $(TOP)/src/mesa/glapi/gl_API.xml getprocaddress.c getprocaddress. texrect: texrect.o readtex.o - $(CC) $(LDFLAGS) texrect.o readtex.o $(LIBS) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) texrect.o readtex.o $(LIBS) -o $@ texrect.o: texrect.c readtex.h $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@ invert: invert.o readtex.o - $(CC) $(LDFLAGS) invert.o readtex.o $(LIBS) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) invert.o readtex.o $(LIBS) -o $@ invert.o: invert.c readtex.h $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@ |