diff options
| author | Jon TURNEY <[email protected]> | 2012-07-16 21:14:43 +0100 |
|---|---|---|
| committer | Jon TURNEY <[email protected]> | 2012-07-16 22:54:36 +0100 |
| commit | d80fd04639a6e378c6e13c8ffaa91d43decf58a8 (patch) | |
| tree | c5e7b46058f109d8bebb8d7a77fcadebe5bc76ed | |
| parent | 8dc074cd92dfc2f80f6c69f80f0d169ad5bb10aa (diff) | |
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 <[email protected]>
Tested-by: Brian Paul <[email protected]>
| -rw-r--r-- | src/mesa/Makefile.am | 5 |
1 files changed, 3 insertions, 2 deletions
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 = |