Mercurial > hg > octave-max
changeset 15230:e5a86de6023c
configure.ac: Improve LLVM configure check and warning (bug #37050)
author | Max Brister <max@2bass.com> |
---|---|
date | Sat, 25 Aug 2012 13:11:34 -0500 |
parents | fbecbce45898 |
children | b0c08e995950 |
files | configure.ac |
diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac +++ b/configure.ac @@ -681,8 +681,6 @@ save_LIBS="$LIBS" save_LDFLAGS="$LDFLAGS" -warn_llvm="LLVM library fails tests. JIT compilation will be disabled." - AC_ARG_VAR(LLVM_CONFIG, [path to llvm-config utility]) AC_ARG_ENABLE([jit-debug], @@ -698,6 +696,8 @@ LLVM_LIBS= if test "x$ac_cv_env_LLVM_CONFIG_set" = "xset"; then + warn_llvm="LLVM was not found or is to old. JIT is disabled." + ## We use -isystem if available because we do not want to see warnings in LLVM LLVM_INCLUDE_FLAG=-I OCTAVE_CC_FLAG(-isystem ., [ @@ -721,7 +721,7 @@ LDFLAGS="$LLVM_LDFLAGS $LDFLAGS" AC_LANG_PUSH(C++) - AC_CHECK_HEADER([llvm/LLVMContext.h], [ + AC_CHECK_HEADERS([llvm/LLVMContext.h, llvm/Support/TargetSelect.h], [ AC_MSG_CHECKING([for llvm::getGlobalContext in llvm/LLVMContext.h]) AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[ @@ -738,7 +738,7 @@ AC_LANG_POP(C++) else - warn_llvm="LLVM_CONFIG not set. JIT compilation will be disabled." + warn_llvm="LLVM_CONFIG not set. The experiential JIT feature is disabled." fi if test -z "$warn_llvm"; then