summaryrefslogtreecommitdiffstats
path: root/src/mesa/Makefile
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2012-06-11 10:25:05 -0700
committerEric Anholt <[email protected]>2012-06-21 09:58:12 -0700
commite426949cf1c328d5686b1048cdcec54a4fbca986 (patch)
tree5e0c596b25bcaf097791394678bb3c363537dbfc /src/mesa/Makefile
parent07b28af5b57338263e8aef5833e7d5085051a655 (diff)
make: Fold ASM_CFLAGS into DEFINES.
Every place that uses ASM_FLAGS already uses DEFINES. Not including it in DEFINES is just a way to screw up potential users, as I've done several times while working on the build system.
Diffstat (limited to 'src/mesa/Makefile')
-rw-r--r--src/mesa/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index b0b461fddfc..6ed7166ea83 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -124,10 +124,10 @@ driver_subdirs: $(MESA_LIBS) $(DRICORE_TARGET)
######################################################################
# Assembly subdirs
asm_subdirs:
- @ if echo "$(ASM_FLAGS)" | grep -q USE_X86_ASM ; then \
+ @ if echo "$(DEFINES)" | grep -q USE_X86_ASM ; then \
(cd x86 && $(MAKE)) || exit 1 ; \
fi
- @ if echo "$(ASM_FLAGS)" | grep -q USE_X86_64_ASM ; then \
+ @ if echo "$(DEFINES)" | grep -q USE_X86_64_ASM ; then \
(cd x86 && $(MAKE)) || exit 1 ; \
(cd x86-64 && $(MAKE)) || exit 1 ; \
fi