summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2018-02-19 20:09:12 +0300
committerAndrei Karas <akaras@inbox.ru>2018-02-19 20:09:12 +0300
commit1e4338f28187a7692007f166fae9f0aceaecae78 (patch)
treeb505ea927451633dfd313264a200b611881095ce
parent50fb5496d0959235b28fed74aa0defbfbce7dae9 (diff)
downloadmanaverse-1e4338f28187a7692007f166fae9f0aceaecae78.tar.gz
manaverse-1e4338f28187a7692007f166fae9f0aceaecae78.tar.bz2
manaverse-1e4338f28187a7692007f166fae9f0aceaecae78.tar.xz
manaverse-1e4338f28187a7692007f166fae9f0aceaecae78.zip
Use libc++ in clang6 builds.
-rwxr-xr-xtools/ci/jobs/clang60.sh2
-rwxr-xr-xtools/ci/jobs/clang60_tests.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/ci/jobs/clang60.sh b/tools/ci/jobs/clang60.sh
index 2fe837b08..d6aaf79c1 100755
--- a/tools/ci/jobs/clang60.sh
+++ b/tools/ci/jobs/clang60.sh
@@ -26,7 +26,7 @@ export CXXFLAGS="$CXXFLAGS -Weverything -Wno-documentation -Wno-padded -Wno-sign
-Wno-variadic-macros -Wno-double-promotion -Wno-attributes -Wno-shadow-field \
-Wpointer-bool-conversion -fno-omit-frame-pointer -Wno-c++98-compat-pedantic \
-Wno-implicit-fallthrough -Wno-zero-as-null-pointer-constant \
--ggdb3 $POST_CXXFLAGS"
+-ggdb3 -stdlib=libc++ $POST_CXXFLAGS"
do_init
run_configure --enable-werror $*
diff --git a/tools/ci/jobs/clang60_tests.sh b/tools/ci/jobs/clang60_tests.sh
index dc87d109c..cc0e46968 100755
--- a/tools/ci/jobs/clang60_tests.sh
+++ b/tools/ci/jobs/clang60_tests.sh
@@ -26,7 +26,7 @@ export CXXFLAGS="$CXXFLAGS -Weverything -Wno-documentation -Wno-padded -Wno-sign
-Wno-variadic-macros -Wno-double-promotion -Wno-attributes -Wno-shadow-field \
-Wpointer-bool-conversion -fno-omit-frame-pointer \
-Wno-zero-as-null-pointer-constant \
--ggdb3 $POST_CXXFLAGS"
+-ggdb3 -stdlib=libc++ $POST_CXXFLAGS"
do_init
run_configure --enable-unittests=yes $*