summaryrefslogtreecommitdiffstats
path: root/progs/trivial
diff options
context:
space:
mode:
authorGuillaume Melquiond <guillaume.melquiond@gmail.com>2008-07-30 07:56:42 -0700
committerDan Nicholson <dbn.lists@gmail.com>2008-07-30 07:56:42 -0700
commit3e8e292db0794a4d2dda1605f86e8f71dbf1d661 (patch)
tree084bc2e62e84afa95df02a4897cc7f0449164921 /progs/trivial
parentb068ab62a0433b6a92374c83f153b3c9ac4b4e5e (diff)
downloadexternal_mesa3d-3e8e292db0794a4d2dda1605f86e8f71dbf1d661.zip
external_mesa3d-3e8e292db0794a4d2dda1605f86e8f71dbf1d661.tar.gz
external_mesa3d-3e8e292db0794a4d2dda1605f86e8f71dbf1d661.tar.bz2
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/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/progs/trivial/Makefile b/progs/trivial/Makefile
index 6fa51ce..e72fb07 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 $@