summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2018-01-01 17:10:55 +0300
committerAndrei Karas <akaras@inbox.ru>2018-01-01 17:20:49 +0300
commit56bb7a17e0df39fc9a8e7fe2c7c4c53d2a8d47ed (patch)
tree4660c8385d33b84fd0e10d94b266d6a30b377485 /tools
parentc508209585cc7153d77d22ddb7b4ce6a291d00de (diff)
downloadmanaplus-56bb7a17e0df39fc9a8e7fe2c7c4c53d2a8d47ed.tar.gz
manaplus-56bb7a17e0df39fc9a8e7fe2c7c4c53d2a8d47ed.tar.bz2
manaplus-56bb7a17e0df39fc9a8e7fe2c7c4c53d2a8d47ed.tar.xz
manaplus-56bb7a17e0df39fc9a8e7fe2c7c4c53d2a8d47ed.zip
Disable warning -Wzero-as-null-pointer-constant in clang 6.
Disabled due disable no way to disable it only in libs.
Diffstat (limited to 'tools')
-rwxr-xr-xtools/ci/jobs/clang60.sh3
-rwxr-xr-xtools/ci/jobs/clang60_tests.sh5
2 files changed, 6 insertions, 2 deletions
diff --git a/tools/ci/jobs/clang60.sh b/tools/ci/jobs/clang60.sh
index db12c82c5..2fe837b08 100755
--- a/tools/ci/jobs/clang60.sh
+++ b/tools/ci/jobs/clang60.sh
@@ -15,6 +15,7 @@ export LOGFILE=clang60.log
source ./tools/ci/scripts/init.sh
# need fix -Wshadow-field
+# add -Wno-zero-as-null-pointer-constant due clang bug
export CXXFLAGS="$CXXFLAGS -Weverything -Wno-documentation -Wno-padded -Wno-sign-conversion \
-Wno-global-constructors -Wno-exit-time-destructors -Wno-weak-vtables \
@@ -24,7 +25,7 @@ export CXXFLAGS="$CXXFLAGS -Weverything -Wno-documentation -Wno-padded -Wno-sign
-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-c++98-compat-pedantic \
--Wno-implicit-fallthrough \
+-Wno-implicit-fallthrough -Wno-zero-as-null-pointer-constant \
-ggdb3 $POST_CXXFLAGS"
do_init
diff --git a/tools/ci/jobs/clang60_tests.sh b/tools/ci/jobs/clang60_tests.sh
index 065d8bfbd..dc87d109c 100755
--- a/tools/ci/jobs/clang60_tests.sh
+++ b/tools/ci/jobs/clang60_tests.sh
@@ -15,6 +15,7 @@ export LOGFILE=clang60.log
source ./tools/ci/scripts/init.sh
# need fix -Wshadow-field
+# add -Wno-zero-as-null-pointer-constant due clang bug
export CXXFLAGS="$CXXFLAGS -Weverything -Wno-documentation -Wno-padded -Wno-sign-conversion \
-Wno-global-constructors -Wno-exit-time-destructors -Wno-weak-vtables \
@@ -23,7 +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 -ggdb3 $POST_CXXFLAGS"
+-Wpointer-bool-conversion -fno-omit-frame-pointer \
+-Wno-zero-as-null-pointer-constant \
+-ggdb3 $POST_CXXFLAGS"
do_init
run_configure --enable-unittests=yes $*