Fix clang39, clang60 ci scripts and clang-tidy configuration.

6 files changed, 8 insertions, 8 deletions

diff --git a/.clang-tidy b/.clang-tidy
index 5da179780..08c3b83db 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,5 +1,5 @@
 ---
-Checks:          'clang-diagnostic-*,clang-analyzer-*,*,-llvm-header-guard,-cppcoreguidelines-special-member-functions,-readability-avoid-const-params-in-decls,-modernize-use-equals-default,-hicpp-use-override,-hicpp-special-member-functions,-readability-redundant-member-init,-hicpp-use-equals-default,-modernize-use-using,-modernize-use-override,-cert-err58-cpp,-modernize-use-default-member-init,-google-runtime-references,-modernize-pass-by-value,-misc-misplaced-const,-cppcoreguidelines-pro-type-const-cast,-readability-else-after-return,-cppcoreguidelines-pro-bounds-constant-array-index,-cppcoreguidelines-pro-type-vararg,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-modernize-loop-convert,-modernize-use-auto,-readability-simplify-boolean-expr,-readability-inconsistent-declaration-parameter-name,-cert-msc30-c,-cert-msc50-cpp,-cppcoreguidelines-pro-type-static-cast-downcast,-cppcoreguidelines-pro-type-reinterpret-cast,-cppcoreguidelines-pro-type-union-access,-llvm-include-order,-google-runtime-int,-cppcoreguidelines-pro-type-member-init,-modernize-use-emplace,-hicpp-member-init,-cert-err34-c,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-cppcoreguidelines-no-malloc,-cert-dcl50-cpp,-clang-analyzer-core.CallAndMessage,-misc-macro-parentheses,-cppcoreguidelines-interfaces-global-init,-readability-redundant-string-cstr,-google-default-arguments,-cert-err52-cpp,-cert-env33-c,-clang-analyzer-cplusplus.NewDeleteLeaks,-clang-analyzer-cplusplus.NewDelete,-modernize-raw-string-literal,-clang-analyzer-core.DivideZero,-misc-misplaced-widening-cast,-modernize-return-braced-init-list,-clang-analyzer-core.NullDereference,-google-readability-function-size,-readability-function-size,-clang-analyzer-security.insecureAPI.strcpy,-CWE-119,-performance-type-promotion-in-math-fn,-google-readability-todo,-clang-analyzer-deadcode.DeadStores,-hicpp-function-size,-misc-definitions-in-headers,-misc-incorrect-roundings,-google-runtime-member-string-references,-google-explicit-constructor,-readability-misleading-indentation,-cert-dcl58-cpp,-hicpp-use-equals-delete,-misc-string-literal-with-embedded-nul,-hicpp-explicit-conversions,-modernize-use-equals-delete,-google-readability-braces-around-statements,-readability-braces-around-statements,-readability-redundant-declaration,-fuchsia-statically-constructed-objects,-bugprone-macro-parentheses,-bugprone-narrowing-conversions,-abseil-string-find-startswith,-clang-analyzer-core.StackAddressEscape,-abseil-string-find-startswith,-hicpp-multiway-paths-covered,-fuchsia-multiple-inheritance'
+Checks:          'clang-diagnostic-*,clang-analyzer-*,*,-llvm-header-guard,-cppcoreguidelines-special-member-functions,-readability-avoid-const-params-in-decls,-modernize-use-equals-default,-hicpp-use-override,-hicpp-special-member-functions,-readability-redundant-member-init,-hicpp-use-equals-default,-modernize-use-using,-modernize-use-override,-cert-err58-cpp,-modernize-use-default-member-init,-google-runtime-references,-modernize-pass-by-value,-misc-misplaced-const,-cppcoreguidelines-pro-type-const-cast,-readability-else-after-return,-cppcoreguidelines-pro-bounds-constant-array-index,-cppcoreguidelines-pro-type-vararg,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-modernize-loop-convert,-modernize-use-auto,-readability-simplify-boolean-expr,-readability-inconsistent-declaration-parameter-name,-cert-msc30-c,-cert-msc50-cpp,-cppcoreguidelines-pro-type-static-cast-downcast,-cppcoreguidelines-pro-type-reinterpret-cast,-cppcoreguidelines-pro-type-union-access,-llvm-include-order,-google-runtime-int,-cppcoreguidelines-pro-type-member-init,-modernize-use-emplace,-hicpp-member-init,-cert-err34-c,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-cppcoreguidelines-no-malloc,-cert-dcl50-cpp,-clang-analyzer-core.CallAndMessage,-misc-macro-parentheses,-cppcoreguidelines-interfaces-global-init,-readability-redundant-string-cstr,-google-default-arguments,-cert-err52-cpp,-cert-env33-c,-clang-analyzer-cplusplus.NewDeleteLeaks,-clang-analyzer-cplusplus.NewDelete,-modernize-raw-string-literal,-clang-analyzer-core.DivideZero,-misc-misplaced-widening-cast,-modernize-return-braced-init-list,-clang-analyzer-core.NullDereference,-google-readability-function-size,-readability-function-size,-clang-analyzer-security.insecureAPI.strcpy,-CWE-119,-performance-type-promotion-in-math-fn,-google-readability-todo,-clang-analyzer-deadcode.DeadStores,-hicpp-function-size,-misc-definitions-in-headers,-misc-incorrect-roundings,-google-runtime-member-string-references,-google-explicit-constructor,-readability-misleading-indentation,-cert-dcl58-cpp,-hicpp-use-equals-delete,-misc-string-literal-with-embedded-nul,-hicpp-explicit-conversions,-modernize-use-equals-delete,-google-readability-braces-around-statements,-readability-braces-around-statements,-readability-redundant-declaration,-fuchsia-statically-constructed-objects,-bugprone-macro-parentheses,-bugprone-narrowing-conversions,-abseil-string-find-startswith,-clang-analyzer-core.StackAddressEscape,-abseil-string-find-startswith,-hicpp-multiway-paths-covered,-fuchsia-multiple-inheritance,-cppcoreguidelines-narrowing-conversions,-bugprone-misplaced-widening-cast,-bugprone-string-literal-with-embedded-nul,-bugprone-incorrect-roundings,-bugprone-parent-virtual-call,-cert-msc32-c,-cppcoreguidelines-narrowing-conversions,-cert-msc51-cpp'
 HeaderFilterRegex: '*'
 AnalyzeTemporaryDtors: false
 CheckOptions:    
diff --git a/tools/ci/jobs/clang39.sh b/tools/ci/jobs/clang39.sh
index 116436515..8345437ae 100755
--- a/tools/ci/jobs/clang39.sh
+++ b/tools/ci/jobs/clang39.sh
@@ -18,10 +18,10 @@ export CXXFLAGS="$CXXFLAGS -Weverything -Wno-documentation -Wno-padded -Wno-sign
 -Wno-global-constructors -Wno-exit-time-destructors -Wno-weak-vtables \
 -Wno-overloaded-virtual -Wno-covered-switch-default -Wno-float-equal -Wno-conversion \
 -Wno-shorten-64-to-32 -Wno-missing-variable-declarations \
--Wno-disabled-macro-expansion -Wno-format-nonliteral -stdlib=libc++ \
+-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-c++98-compat -Wno-implicit-fallthrough \
+-Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-implicit-fallthrough \
 -Wpointer-bool-conversion -fno-omit-frame-pointer -ggdb3 $POST_CXXFLAGS"
 
 do_init
diff --git a/tools/ci/jobs/clang39.sh_c++11.sh b/tools/ci/jobs/clang39.sh_c++11.sh
index 25a28a48c..95343ccd9 100755
--- a/tools/ci/jobs/clang39.sh_c++11.sh
+++ b/tools/ci/jobs/clang39.sh_c++11.sh
@@ -18,7 +18,7 @@ export CXXFLAGS="$CXXFLAGS -Weverything -Wno-documentation -Wno-padded -Wno-sign
 -Wno-global-constructors -Wno-exit-time-destructors -Wno-weak-vtables \
 -Wno-overloaded-virtual -Wno-covered-switch-default -Wno-float-equal -Wno-conversion \
 -Wno-shorten-64-to-32 -Wno-missing-variable-declarations \
--Wno-disabled-macro-expansion -Wno-format-nonliteral -stdlib=libc++ \
+-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 \
 -Wpointer-bool-conversion \
diff --git a/tools/ci/jobs/clang39_sdl2.sh b/tools/ci/jobs/clang39_sdl2.sh
index a5180690a..c7a05170b 100755
--- a/tools/ci/jobs/clang39_sdl2.sh
+++ b/tools/ci/jobs/clang39_sdl2.sh
@@ -18,10 +18,10 @@ export CXXFLAGS="$CXXFLAGS -Weverything -Wno-documentation -Wno-padded -Wno-sign
 -Wno-global-constructors -Wno-exit-time-destructors -Wno-weak-vtables \
 -Wno-overloaded-virtual -Wno-covered-switch-default -Wno-float-equal -Wno-conversion \
 -Wno-shorten-64-to-32 -Wno-missing-variable-declarations \
--Wno-disabled-macro-expansion -Wno-format-nonliteral -stdlib=libc++ \
+-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-c++98-compat -Wno-implicit-fallthrough \
+-Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-implicit-fallthrough \
 -Wpointer-bool-conversion -fno-omit-frame-pointer -ggdb3 $POST_CXXFLAGS"
 
 do_init
diff --git a/tools/ci/jobs/clang60.sh b/tools/ci/jobs/clang60.sh
index af25ea546..486fb05b7 100755
--- a/tools/ci/jobs/clang60.sh
+++ b/tools/ci/jobs/clang60.sh
@@ -27,7 +27,7 @@ export CXXFLAGS="$CXXFLAGS -Weverything -Wno-documentation -Wno-padded -Wno-sign
 -Wpointer-bool-conversion -fno-omit-frame-pointer -Wno-c++98-compat-pedantic \
 -Wno-implicit-fallthrough -Wno-zero-as-null-pointer-constant \
 -Wno-c++98-compat-pedantic \
--ggdb3 -stdlib=libc++ $POST_CXXFLAGS"
+-ggdb3 $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 20e59c427..59aebe4ae 100755
--- a/tools/ci/jobs/clang60_tests.sh
+++ b/tools/ci/jobs/clang60_tests.sh
@@ -27,7 +27,7 @@ export CXXFLAGS="$CXXFLAGS -Weverything -Wno-documentation -Wno-padded -Wno-sign
 -Wpointer-bool-conversion -fno-omit-frame-pointer \
 -Wno-zero-as-null-pointer-constant \
 -Wno-c++98-compat-pedantic \
--ggdb3 -stdlib=libc++ $POST_CXXFLAGS"
+-ggdb3 $POST_CXXFLAGS"
 
 do_init
 run_configure --enable-unittests=yes $*