diff options
author | Chandler Carruth <chandlerc@gmail.com> | 2014-01-15 10:34:30 +0000 |
---|---|---|
committer | Chandler Carruth <chandlerc@gmail.com> | 2014-01-15 10:34:30 +0000 |
commit | 9ac0e23865889b4668e2661a0d01091ef1559d6d (patch) | |
tree | 241fefa3fb00c34d70b744996f57747232bfc757 | |
parent | 9c62b5eabb41d41023815df01d07bda5abbd8c4c (diff) | |
download | llvm-9ac0e23865889b4668e2661a0d01091ef1559d6d.tar.gz llvm-9ac0e23865889b4668e2661a0d01091ef1559d6d.tar.bz2 llvm-9ac0e23865889b4668e2661a0d01091ef1559d6d.tar.xz |
Fix a bug in r199313 where I failed to restore CXXFLAGS. Doh! Not
*quite* ready to just slam C++11 on by default.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@199314 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | autoconf/configure.ac | 1 | ||||
-rwxr-xr-x | configure | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/autoconf/configure.ac b/autoconf/configure.ac index 6906a7586b..7e399fcddd 100644 --- a/autoconf/configure.ac +++ b/autoconf/configure.ac @@ -164,6 +164,7 @@ standard library. If this error is incorrect or you need to force things to work, you may pass '--disable-compiler-version-checks' to configure to bypass this test.])]) + CXXFLAGS="$llvm_cv_old_cxxflags" ;; gcc) AC_MSG_CHECKING([whether GCC is new enough]) @@ -3871,6 +3871,7 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext + CXXFLAGS="$llvm_cv_old_cxxflags" ;; gcc) { echo "$as_me:$LINENO: checking whether GCC is new enough" >&5 @@ -10660,7 +10661,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10663 "configure" +#line 10664 "configure" #include "confdefs.h" #if HAVE_DLFCN_H |