diff options
| author | Marshall Clow <mclow.lists@gmail.com> | 2014-01-14 17:00:40 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow.lists@gmail.com> | 2014-01-14 17:00:40 +0000 |
| commit | 4cdc6feb4fd7fc6c77721d64821e34ae72157250 (patch) | |
| tree | 549272c702290cb370bc8d01923a65f991be3309 /libcxx/lib | |
| parent | 9d176af731437fc570f294498467416130f7ad15 (diff) | |
| download | bcm5719-llvm-4cdc6feb4fd7fc6c77721d64821e34ae72157250.tar.gz bcm5719-llvm-4cdc6feb4fd7fc6c77721d64821e34ae72157250.zip | |
Update lib/buildit and test/testit to both pay attention to an env flag CXX_LANG, which people can set to 'c++03', 'c++11' or 'c++1y' to build/test using that language variant. If you don't set this env variable, you get c++11, just like today. Drive-by fix; remove duplicate -nostdinc++.
llvm-svn: 199222
Diffstat (limited to 'libcxx/lib')
| -rwxr-xr-x | libcxx/lib/buildit | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libcxx/lib/buildit b/libcxx/lib/buildit index af6b4668ce5..00f0adfe91f 100755 --- a/libcxx/lib/buildit +++ b/libcxx/lib/buildit @@ -17,6 +17,11 @@ then CXX=clang++ fi +if [ -z "$CXX_LANG" ] +then + CXX_LANG=c++1y +fi + if [ -z "$CC" ] then CC=clang @@ -35,7 +40,7 @@ then RC_ProjectSourceVersion=1 fi -EXTRA_FLAGS="-nostdinc++ -std=c++11 -fstrict-aliasing -Wall -Wextra -Wshadow -Wconversion \ +EXTRA_FLAGS="-nostdinc++ -std=${CXX_LANG} -fstrict-aliasing -Wall -Wextra -Wshadow -Wconversion \ -Wpadded -Wstrict-aliasing=2 -Wstrict-overflow=4 " case $TRIPLE in @@ -58,7 +63,7 @@ case $TRIPLE in else if [ -n "$SDKROOT" ] then - EXTRA_FLAGS+="-nostdinc++ -isysroot ${SDKROOT}" + EXTRA_FLAGS+="-isysroot ${SDKROOT} " if echo "${RC_ARCHS}" | grep -q "armv7" then RE_EXPORT_LINE="${SDKROOT}/usr/lib/libc++abi.dylib -Wl,-reexported_symbols_list,libc++sjlj-abi.exp" |
