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 | 577322a0d36c4d13d091ed18574fb958732df022 (patch) | |
| tree | 5ada5a3538886ab80f1bda2cda90bc0822b7a10c | |
| parent | f8c6ccf85d3d97b3d9c213137e2a12fbb9fafabe (diff) | |
| download | bcm5719-llvm-577322a0d36c4d13d091ed18574fb958732df022.tar.gz bcm5719-llvm-577322a0d36c4d13d091ed18574fb958732df022.zip | |
Fix a bug in r199313 where I failed to restore CXXFLAGS. Doh! Not
*quite* ready to just slam C++11 on by default.
llvm-svn: 199314
| -rw-r--r-- | llvm/autoconf/configure.ac | 1 | ||||
| -rwxr-xr-x | llvm/configure | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/llvm/autoconf/configure.ac b/llvm/autoconf/configure.ac index 6906a7586ba..7e399fcddd0 100644 --- a/llvm/autoconf/configure.ac +++ b/llvm/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]) diff --git a/llvm/configure b/llvm/configure index b6ccfdb667a..a1b63f88888 100755 --- a/llvm/configure +++ b/llvm/configure @@ -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 |
