diff options
| -rw-r--r-- | Makefile.config.in | 2 | ||||
| -rw-r--r-- | autoconf/configure.ac | 6 | ||||
| -rwxr-xr-x | configure | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.config.in b/Makefile.config.in index a4d9f3d7c5fd..e57ab815b669 100644 --- a/Makefile.config.in +++ b/Makefile.config.in @@ -196,7 +196,6 @@ LLVMCC1 := @LLVMCC1@ LLVMCC1PLUS := @LLVMCC1PLUS@ LLVMGCC_LANGS := @LLVMGCC_LANGS@ LLVMGCC_DRAGONEGG := @LLVMGCC_DRAGONEGG@ -LLVMGCC_DISABLEOPT_FLAGS := @LLVMGCC_DISABLEOPT_FLAGS@ # Information on Clang, if configured. CLANGPATH := @CLANGPATH@ @@ -208,6 +207,7 @@ LLVMCC_OPTION := @LLVMCC_OPTION@ # The flag used to emit LLVM IR. LLVMCC_EMITIR_FLAG = @LLVMCC_EMITIR_FLAG@ +LLVMCC_DISABLEOPT_FLAGS := @LLVMCC_DISABLEOPT_FLAGS@ # Path to directory where object files should be stored during a build. # Set OBJ_ROOT to "." if you do not want to use a separate place for diff --git a/autoconf/configure.ac b/autoconf/configure.ac index 38d2f08e0aea..d40d9473736d 100644 --- a/autoconf/configure.ac +++ b/autoconf/configure.ac @@ -1438,10 +1438,10 @@ dnl Set the flags needed to emit LLVM IR and to disable optimizations dnl in llvmgcc if test "$llvm_cv_llvmgcc_dragonegg" = "yes" ; then LLVMCC_EMITIR_FLAG="-fplugin-arg-dragonegg-emit-ir" - LLVMGCC_DISABLEOPT_FLAGS="-fplugin-arg-dragonegg-disable-llvm-optzns" + LLVMCC_DISABLEOPT_FLAGS="-fplugin-arg-dragonegg-disable-llvm-optzns" else LLVMCC_EMITIR_FLAG="-emit-llvm" - LLVMGCC_DISABLEOPT_FLAGS="-mllvm -disable-llvm-optzns" + LLVMCC_DISABLEOPT_FLAGS="-mllvm -disable-llvm-optzns" fi AC_SUBST(LLVMCC_EMITIR_FLAG) @@ -1472,7 +1472,7 @@ if test "$llvm_cv_llvmgcc_sanity" = "yes" ; then llvmgcclangs=[`$LLVMGCC -v --help 2>&1 | grep '^Configured with:' | sed 's/^.*--enable-languages=\([^ ]*\).*/\1/'`] AC_SUBST(LLVMGCC_LANGS,$llvmgcclangs) AC_SUBST(LLVMGCC_DRAGONEGG,$llvm_cv_llvmgcc_dragonegg) - AC_SUBST(LLVMGCC_DISABLEOPT_FLAGS) + AC_SUBST(LLVMCC_DISABLEOPT_FLAGS) AC_MSG_RESULT([ok]) fi diff --git a/configure b/configure index 60f99f2f4971..3b560f5c3cce 100755 --- a/configure +++ b/configure @@ -773,12 +773,12 @@ HAVE_PTHREAD HUGE_VAL_SANITY MMAP_FILE LLVMCC_EMITIR_FLAG +LLVMCC_DISABLEOPT_FLAGS LLVMCC1 LLVMCC1PLUS LLVMGCCDIR LLVMGCC_LANGS LLVMGCC_DRAGONEGG -LLVMGCC_DISABLEOPT_FLAGS SHLIBEXT SHLIBPATH_VAR LLVM_PREFIX @@ -20600,10 +20600,10 @@ echo "${ECHO_T}$llvm_cv_llvmgcc_dragonegg" >&6; } if test "$llvm_cv_llvmgcc_dragonegg" = "yes" ; then LLVMCC_EMITIR_FLAG="-fplugin-arg-dragonegg-emit-ir" - LLVMGCC_DISABLEOPT_FLAGS="-fplugin-arg-dragonegg-disable-llvm-optzns" + LLVMCC_DISABLEOPT_FLAGS="-fplugin-arg-dragonegg-disable-llvm-optzns" else LLVMCC_EMITIR_FLAG="-emit-llvm" - LLVMGCC_DISABLEOPT_FLAGS="-mllvm -disable-llvm-optzns" + LLVMCC_DISABLEOPT_FLAGS="-mllvm -disable-llvm-optzns" fi @@ -21839,12 +21839,12 @@ HAVE_PTHREAD!$HAVE_PTHREAD$ac_delim HUGE_VAL_SANITY!$HUGE_VAL_SANITY$ac_delim MMAP_FILE!$MMAP_FILE$ac_delim LLVMCC_EMITIR_FLAG!$LLVMCC_EMITIR_FLAG$ac_delim +LLVMCC_DISABLEOPT_FLAGS!$LLVMCC_DISABLEOPT_FLAGS$ac_delim LLVMCC1!$LLVMCC1$ac_delim LLVMCC1PLUS!$LLVMCC1PLUS$ac_delim LLVMGCCDIR!$LLVMGCCDIR$ac_delim LLVMGCC_LANGS!$LLVMGCC_LANGS$ac_delim LLVMGCC_DRAGONEGG!$LLVMGCC_DRAGONEGG$ac_delim -LLVMGCC_DISABLEOPT_FLAGS!$LLVMGCC_DISABLEOPT_FLAGS$ac_delim SHLIBEXT!$SHLIBEXT$ac_delim SHLIBPATH_VAR!$SHLIBPATH_VAR$ac_delim LLVM_PREFIX!$LLVM_PREFIX$ac_delim |