summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorChandler Carruth <chandlerc@gmail.com>2014-03-01 03:33:08 +0000
committerChandler Carruth <chandlerc@gmail.com>2014-03-01 03:33:08 +0000
commitf38b536b3d49b376c40155ae729e33ecc3069b47 (patch)
treea9e5805e9f3d41c16528f130beebcad4ec3990d3 /configure
parentb23750a8ae1628d98d6b0ad0ec3e975a3c42863b (diff)
downloadllvm-f38b536b3d49b376c40155ae729e33ecc3069b47.tar.gz
llvm-f38b536b3d49b376c40155ae729e33ecc3069b47.tar.bz2
llvm-f38b536b3d49b376c40155ae729e33ecc3069b47.tar.xz
[C++11] Replace autoconf --enable-cxx11 with --enable-cxx1y. The
baseline is now C++11, and we unconditionally add -std=c++11 to the flags. This has the dim potential to break some non-GNU-compatible compiler (in terms of -std flags) using the makefiles, but those makefiles are littered with GNU-style compile flags so it would be very surprising to me for it to actually happen in practice. As always, do let me know if there is a toolchain you're using where this doesn't work, and I'll be watching the bots. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@202569 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure22
1 files changed, 11 insertions, 11 deletions
diff --git a/configure b/configure
index deab9899d9..534cd47a00 100755
--- a/configure
+++ b/configure
@@ -684,7 +684,7 @@ BUILD_EXEEXT
BUILD_CXX
CVSBUILD
ENABLE_LIBCPP
-ENABLE_CXX11
+ENABLE_CXX1Y
ENABLE_SPLIT_DWARF
ENABLE_CLANG_ARCMT
ENABLE_CLANG_STATIC_ANALYZER
@@ -1402,7 +1402,7 @@ Optional Features:
--enable-compiler-version-checks
Check the version of the host compiler (default is
YES)
- --enable-cxx11 Use c++11 if available (default is YES)
+ --enable-cxx1y Use c++1y if available (default is NO)
--enable-split-dwarf Use split-dwarf if available (default is NO)
--enable-clang-arcmt Enable building of clang ARCMT (default is YES)
--enable-clang-static-analyzer
@@ -4804,22 +4804,22 @@ echo "$as_me: error: Invalid setting for --enable-compiler-version-checks. Use \
;;
esac
-# Check whether --enable-cxx11 was given.
-if test "${enable_cxx11+set}" = set; then
- enableval=$enable_cxx11;
+# Check whether --enable-cxx1y was given.
+if test "${enable_cxx1y+set}" = set; then
+ enableval=$enable_cxx1y;
else
enableval=default
fi
case "$enableval" in
- yes) ENABLE_CXX11=1
+ yes) ENABLE_CXX1Y=1
;;
- no) ENABLE_CXX11=0
+ no) ENABLE_CXX1Y=0
;;
- default) ENABLE_CXX11=1
+ default) ENABLE_CXX1Y=0
;;
- *) { { echo "$as_me:$LINENO: error: Invalid setting for --enable-cxx11. Use \"yes\" or \"no\"" >&5
-echo "$as_me: error: Invalid setting for --enable-cxx11. Use \"yes\" or \"no\"" >&2;}
+ *) { { echo "$as_me:$LINENO: error: Invalid setting for --enable-cxx1y. Use \"yes\" or \"no\"" >&5
+echo "$as_me: error: Invalid setting for --enable-cxx1y. Use \"yes\" or \"no\"" >&2;}
{ (exit 1); exit 1; }; } ;;
esac
@@ -20165,7 +20165,7 @@ BUILD_EXEEXT!$BUILD_EXEEXT$ac_delim
BUILD_CXX!$BUILD_CXX$ac_delim
CVSBUILD!$CVSBUILD$ac_delim
ENABLE_LIBCPP!$ENABLE_LIBCPP$ac_delim
-ENABLE_CXX11!$ENABLE_CXX11$ac_delim
+ENABLE_CXX1Y!$ENABLE_CXX1Y$ac_delim
ENABLE_SPLIT_DWARF!$ENABLE_SPLIT_DWARF$ac_delim
ENABLE_CLANG_ARCMT!$ENABLE_CLANG_ARCMT$ac_delim
ENABLE_CLANG_STATIC_ANALYZER!$ENABLE_CLANG_STATIC_ANALYZER$ac_delim