Mercurial > hg > octave-nkf
changeset 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 | af924e6572cb |
children | 82c94987abc6 |
files | configure.ac libinterp/Makefile.am libinterp/corefcn/module.mk |
diffstat | 3 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac +++ b/configure.ac @@ -772,9 +772,7 @@ CPPFLAGS="-D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS $LLVM_CPPFLAGS $CPPFLAGS" CXXFLAGS="$LLVM_CXXFLAGS $CXXFLAGS" AC_LANG_PUSH(C++) - AC_CHECK_HEADER([llvm/Support/TargetSelect.h], [ - warn_llvm= - XTRA_CXXFLAGS="$XTRA_CXXFLAGS $LLVM_CXXFLAGS $LLVM_CPPFLAGS"]) + AC_CHECK_HEADER([llvm/Support/TargetSelect.h], [warn_llvm=""]) have_function_h=no AC_CHECK_HEADERS([llvm/IR/Function.h llvm/Function.h],
--- a/libinterp/Makefile.am +++ b/libinterp/Makefile.am @@ -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 $@
--- a/libinterp/corefcn/module.mk +++ b/libinterp/corefcn/module.mk @@ -319,8 +319,10 @@ corefcn_libcorefcn_la_SOURCES = $(COREFCN_SRC) corefcn_libcorefcn_la_CPPFLAGS = $(liboctinterp_la_CPPFLAGS) \ $(FFTW_XCPPFLAGS) \ + $(FONTCONFIG_CPPFLAGS) \ $(FT2_CPPFLAGS) \ - $(FONTCONFIG_CPPFLAGS) + $(LLVM_CPPFLAGS) +corefcn_libcorefcn_la_CXXFLAGS = $(AM_CXXFLAGS) $(LLVM_CXXFLAGS) corefcn_libtex_parser_la_SOURCES = $(TEX_PARSER_SRC) corefcn_libtex_parser_la_CPPFLAGS = $(liboctinterp_la_CPPFLAGS)