Mercurial > octave-nkf
diff libinterp/Makefile.am @ 17820:3488d987eb50
build: Remove LLVM_(CPPFLAGS|CXXFLAGS) from XTRA_CXXFLAGS.
* configure.ac: Don't add LLVM_CPPFLAGS, LLVM_CXXFLAGS to XTRA_CXXFLAGS.
* libinterp/Makefile.am: Add LLVM_CPPFLAGS to *.cc -> *.df rule.
* libinterp/corefcn/module.mk: Add LLVM_CPPFLAGS to corefcn specific CPPFLAGS.
Create new corefcn specific CXXFLAGS variable and add LLVM_CXXFLAGS to it.
author | Rik <rik@octave.org> |
---|---|
date | Thu, 31 Oct 2013 17:10:38 -0700 |
parents | e6317049225b |
children | f22714d4a5da |
line wrap: on
line diff
--- a/libinterp/Makefile.am Thu Oct 31 16:38:32 2013 -0700 +++ b/libinterp/Makefile.am Thu Oct 31 17:10:38 2013 -0700 @@ -229,16 +229,16 @@ ## Rule to build a DEF file from a .cc file ## -## FIXME -- This rule should be fixed to avoid using special +## FIXME: This rule should be fixed to avoid using special ## flags like JAVA_CPPFLAGS for every file. How could it be written ## so that it uses octave_value_liboctave_value_la_CPPFLAGS when ## generating the octave-value/*.df files? ## -## FIXME -- Shouldn't the build stop if CPP fails here? +## FIXME: Shouldn't the build stop if CPP fails here? Yes (10/31/2013) %.df: %.cc $(CXXCPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(JAVA_CPPFLAGS) $(FT2_CPPFLAGS) $(FONTCONFIG_CPPFLAGS) \ - $(CPPFLAGS) \ + $(AM_CPPFLAGS) $(FONTCONFIG_CPPFLAGS) $(FT2_CPPFLAGS) \ + $(JAVA_CPPFLAGS) $(LLVM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CXXFLAGS) $(CXXFLAGS) \ -DMAKE_BUILTINS $< | $(srcdir)/mkdefs $(srcdir) $< > $@-t mv $@-t $@