From: Jon TURNEY Date: Mon, 16 Jul 2012 20:14:43 +0000 (+0100) Subject: Fix building mesa with assembly enabled since a112ca5d X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d80fd04639a6e378c6e13c8ffaa91d43decf58a8;p=mesa.git Fix building mesa with assembly enabled since a112ca5d a112ca5d rather crassly smashed all the compiler flags together into AM_CFLAGS. Separate them out the way they were before, putting pre-processor flags into AM_CPPFLAGS, so assembly source gets preprocessed with the correct pre-processor flags as well. Also, remove unneeded CFLAGS from AM_CFLAGS, and CXXFLAGS from AM_CXXFLAGS Signed-off-by: Jon TURNEY Tested-by: Brian Paul --- diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am index 54c1bf8ad0d..2b023d7279a 100644 --- a/src/mesa/Makefile.am +++ b/src/mesa/Makefile.am @@ -98,8 +98,9 @@ noinst_LTLIBRARIES = libmesa.la libmesagallium.la SRCDIR = $(top_srcdir)/src/mesa include sources.mak -AM_CFLAGS = $(API_DEFINES) $(DEFINES) $(INCLUDE_DIRS) $(LLVM_CFLAGS) $(CFLAGS) -AM_CXXFLAGS = $(API_DEFINES) $(DEFINES) $(INCLUDE_DIRS) $(LLVM_CFLAGS) $(CXXFLAGS) +AM_CPPFLAGS = $(API_DEFINES) $(DEFINES) $(INCLUDE_DIRS) +AM_CFLAGS = $(LLVM_CFLAGS) +AM_CXXFLAGS = $(LLVM_CFLAGS) # cannot just add $(MESA_ASM_FILES) to libmesa_la_SOURCES as it contains a configure substitution MESA_ASM_FILES_FOR_ARCH =