diff options
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/Makefile.am | 7 | ||||
| -rw-r--r-- | src/mesa/x86/Makefile.am | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am index a54b8ac1b30..5f9bae2ac2a 100644 --- a/src/mesa/Makefile.am +++ b/src/mesa/Makefile.am @@ -98,12 +98,13 @@ AM_CXXFLAGS = $(LLVM_CFLAGS) $(VISIBILITY_CXXFLAGS) MESA_ASM_FILES_FOR_ARCH = if HAVE_X86_ASM -MESA_ASM_FILES_FOR_ARCH += $(X86_FILES) -AM_CPPFLAGS += -I$(builddir)/x86 -I$(srcdir)/x86 -endif if HAVE_X86_64_ASM MESA_ASM_FILES_FOR_ARCH += $(X86_64_FILES) AM_CPPFLAGS += -I$(builddir)/x86-64 -I$(srcdir)/x86-64 +else +MESA_ASM_FILES_FOR_ARCH += $(X86_FILES) +AM_CPPFLAGS += -I$(builddir)/x86 -I$(srcdir)/x86 +endif endif if HAVE_SPARC_ASM MESA_ASM_FILES_FOR_ARCH += $(SPARC_FILES) diff --git a/src/mesa/x86/Makefile.am b/src/mesa/x86/Makefile.am index 167857684b1..9b4a2dd0b9a 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 |