summaryrefslogtreecommitdiffstats
path: root/src/mesa/x86
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gmail.com>2013-11-05 13:53:45 -0800
committerMatt Turner <mattst88@gmail.com>2013-11-07 10:00:25 -0800
commitd8abd6710ea41545ae2fb9b8e718d29a69574b1a (patch)
tree6d001f0f881458b6dc129c17909a6af9f27f1ae0 /src/mesa/x86
parent957c7570ea3f7d6ea4cf2cc49d85207136fb0470 (diff)
downloadexternal_mesa3d-d8abd6710ea41545ae2fb9b8e718d29a69574b1a.zip
external_mesa3d-d8abd6710ea41545ae2fb9b8e718d29a69574b1a.tar.gz
external_mesa3d-d8abd6710ea41545ae2fb9b8e718d29a69574b1a.tar.bz2
build: Change HAVE_X86_ASM to mean x86 or x86-64 asm.
I want a conditional that says generally "we have x86 assembly" in the next patch. Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'src/mesa/x86')
-rw-r--r--src/mesa/x86/Makefile.am2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/x86/Makefile.am b/src/mesa/x86/Makefile.am
index 1678576..9b4a2dd 100644
--- a/src/mesa/x86/Makefile.am
+++ b/src/mesa/x86/Makefile.am
@@ -20,6 +20,7 @@
# IN THE SOFTWARE.
if HAVE_X86_ASM
+if !HAVE_X86_64_ASM
AM_CPPFLAGS = \
-I$(top_srcdir)/include \
@@ -47,3 +48,4 @@ matypes.h: gen_matypes
endif
endif
+endif