Mercurial > octave-nkf
changeset 14990:149d1e2224f0
configure.ac: llvm include goes in CPPFLAGS not CXXFLAGS
| author | Max Brister <max@2bass.com> |
|---|---|
| date | Thu, 12 Jul 2012 13:15:27 -0500 |
| parents | dfaa8da46364 |
| children | 6bc39019f726 |
| files | configure.ac |
| diffstat | 1 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Wed Jul 11 17:34:22 2012 -0500 +++ b/configure.ac Thu Jul 12 13:15:27 2012 -0500 @@ -735,6 +735,7 @@ AC_DEFINE(OCTAVE_JIT_DEBUG, 1, [Define for jit debug printing]) ]) +LLVM_CXXFLAGS= LLVM_CPPFLAGS= LLVM_LDFLAGS= LLVM_LIBS= @@ -744,7 +745,8 @@ LLVM_LDFLAGS="-L`$LLVM_CONFIG --libdir`" LLVM_LIBS=`$LLVM_CONFIG --libs` dnl Use -isystem so we don't get warnings from llvm headers - LLVM_CXXFLAGS="-isystem `$LLVM_CONFIG --includedir`" + LLVM_CPPFLAGS="-isystem `$LLVM_CONFIG --includedir`" + LLVM_CXXFLAGS= fi save_CPPFLAGS="$CPPFLAGS" @@ -756,7 +758,7 @@ dnl Idealy we should get these from llvm-config, but llvm-config isn't very dnl helpful. dnl -CPPFLAGS="-D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS $CPPFLAGS" +CPPFLAGS="-D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS $LLVM_CPPFLAGS $CPPFLAGS" CXXFLAGS="$LLVM_CXXFLAGS $CXXFLAGS" LIBS="$LLVM_LIBS $LIBS" LDFLAGS="$LLVM_LDFLAGS $LDFLAGS" @@ -770,7 +772,7 @@ [ AC_MSG_RESULT([yes]) warn_llvm= - XTRA_CXXFLAGS="$XTRA_CXXFLAGS $LLVM_CXXFLAGS" + XTRA_CXXFLAGS="$XTRA_CXXFLAGS $LLVM_CXXFLAGS $LLVM_CPPFLAGS" ], [AC_MSG_RESULT([no]) ]) @@ -784,12 +786,14 @@ if test -z "$warn_llvm"; then AC_DEFINE(HAVE_LLVM, 1, [Define if LLVM is available]) else + LLVM_CXXFLAGS= LLVM_CPPFLAGS= LLVM_LDFLAGS= LLVM_LIBS= AC_MSG_WARN([$warn_llvm]) fi +AC_SUBST(LLVM_CXXFLAGS) AC_SUBST(LLVM_CPPFLAGS) AC_SUBST(LLVM_LDFLAGS) AC_SUBST(LLVM_LIBS)