diff options
| author | Andrei Karas <akaras@inbox.ru> | 2018-02-19 18:37:18 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2018-02-19 20:08:21 +0300 |
| commit | 50fb5496d0959235b28fed74aa0defbfbce7dae9 (patch) | |
| tree | a88cfda10d6dcb1cd06bd45ad3e52e3670269057 | |
| parent | 4f3dca2f9338402005c1bc5b6043d583f58390f0 (diff) | |
| download | manaplus-50fb5496d0959235b28fed74aa0defbfbce7dae9.tar.gz manaplus-50fb5496d0959235b28fed74aa0defbfbce7dae9.tar.bz2 manaplus-50fb5496d0959235b28fed74aa0defbfbce7dae9.tar.xz manaplus-50fb5496d0959235b28fed74aa0defbfbce7dae9.zip | |
Use libc++ in clang7 builds.
| -rwxr-xr-x | tools/ci/jobs/clang70.sh | 2 | ||||
| -rwxr-xr-x | tools/ci/jobs/clang70_tests.sh | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/ci/jobs/clang70.sh b/tools/ci/jobs/clang70.sh index a986e6f38..fe5d919d9 100755 --- a/tools/ci/jobs/clang70.sh +++ b/tools/ci/jobs/clang70.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/clang70_tests.sh b/tools/ci/jobs/clang70_tests.sh index e4a72c75a..8c6832710 100755 --- a/tools/ci/jobs/clang70_tests.sh +++ b/tools/ci/jobs/clang70_tests.sh @@ -24,9 +24,9 @@ export CXXFLAGS="$CXXFLAGS -Weverything -Wno-documentation -Wno-padded -Wno-sign -Wno-disabled-macro-expansion -Wno-format-nonliteral \ -Wno-reserved-id-macro -Wno-packed -Wno-documentation-unknown-command \ -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" +-Wpointer-bool-conversion -fno-omit-frame-pointer -Wno-c++98-compat-pedantic \ +-Wno-implicit-fallthrough -Wno-zero-as-null-pointer-constant \ +-ggdb3 -stdlib=libc++ $POST_CXXFLAGS" do_init run_configure --enable-unittests=yes $* |