summaryrefslogtreecommitdiff
path: root/Makefile.rules
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 /Makefile.rules
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 'Makefile.rules')
-rw-r--r--Makefile.rules6
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.rules b/Makefile.rules
index 3f1c2afe73..62428d1a72 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -319,8 +319,10 @@ ifeq ($(ENABLE_LIBCPP),1)
LD.Flags += -stdlib=libc++
endif
-ifeq ($(ENABLE_CXX11),1)
- CXX.Flags += -std=c++11
+ifeq ($(ENABLE_CXX1Y),1)
+ CXX.Flags += -std=c++1y
+else
+ CXX.Flags += -std=c++11
endif
ifeq ($(ENABLE_WERROR),1)