diff options
author | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-02-14 12:50:22 +0300 |
---|---|---|
committer | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-02-14 12:50:22 +0300 |
commit | 45fd996f054b866273c44f7dc345703befda4c84 (patch) | |
tree | cae0bb4d406e57d51e8b65d9a97bb215536774a5 /build/conf/compilers | |
parent | 2e3663422353da95615fec18d1aa32fa7b6e9edf (diff) | |
download | ydb-45fd996f054b866273c44f7dc345703befda4c84.tar.gz |
intermediate changes
ref:8ab60421cc2ba564e8436a30100c3fa0e5d46de6
Diffstat (limited to 'build/conf/compilers')
-rw-r--r-- | build/conf/compilers/gnu_compiler.conf | 4 | ||||
-rw-r--r-- | build/conf/compilers/msvc_compiler.conf | 24 |
2 files changed, 16 insertions, 12 deletions
diff --git a/build/conf/compilers/gnu_compiler.conf b/build/conf/compilers/gnu_compiler.conf index 373be5bedd..0059a43143 100644 --- a/build/conf/compilers/gnu_compiler.conf +++ b/build/conf/compilers/gnu_compiler.conf @@ -261,6 +261,10 @@ DEBUG_INFO_FLAGS=$_DEBUG_INFO_FLAGS when ($NO_WSHADOW == "yes") { C_WARNING_OPTS += -Wno-shadow } +# Though -w is intended to switch off all the warnings, +# it does not switch at least -Wregister and -Wreserved-user-defined-literal under clang. +# +# Use -Wno-everything to force warning suppression. when ($NO_COMPILER_WARNINGS == "yes") { C_WARNING_OPTS = -w CXX_WARNING_OPTS = -Wno-everything diff --git a/build/conf/compilers/msvc_compiler.conf b/build/conf/compilers/msvc_compiler.conf index 6667f35c5c..0db1349194 100644 --- a/build/conf/compilers/msvc_compiler.conf +++ b/build/conf/compilers/msvc_compiler.conf @@ -62,7 +62,6 @@ _CXX_WARNINGS_CLANG_CL_2019= _CXX_WARNINGS_CLANG_CL_2019_IDE_MSVS= when ($CLANG_CL == "yes") { _C_WARNINGS_CLANG_CL=\ --Wno-absolute-value \ -Wno-bitwise-op-parentheses \ -Wno-dll-attribute-on-redeclaration \ -Wno-extern-initializer \ @@ -82,11 +81,6 @@ when ($CLANG_CL == "yes") { _CXX_WARNINGS_CLANG_CL=\ -Woverloaded-virtual \ --Wno-attributes - # IGNIETFERRO-722 needed for contrib - _CXX_WARNINGS_CLANG_CL+=-Wno-register - - _CXX_WARNINGS_CLANG_CL+=\ -Wimport-preprocessor-directive-pedantic \ -Wno-undefined-var-template @@ -159,7 +153,6 @@ _C_DEFINES+=$_DEFINES_UNICODE C_DEFINES+=$_C_DEFINES _MSVC_FLAGS_CLANG= -_MSVC_FLAGS_CLANG_NO_WARNINGS= _MSVC_FLAGS_CLANG_ARCH= _MSVC_FLAGS_CLANG_EQ_2019= when ($CLANG_CL == "yes") { @@ -180,9 +173,6 @@ when ($CLANG_CL == "yes") { _MSVC_FLAGS_CLANG_ARCH= } - # Some warnings are getting triggered even when NO_COMPILER_WARNINGS is enabled - _MSVC_FLAGS_CLANG_NO_WARNINGS=-Wno-c++11-narrowing -Wno-register - when ($_TC_VERSION_EXACTLY_2019 == "yes") { # heretic: на момент коммита в нашей конфигурации указано, что тулчейн clang11-windows - аналог msvc 2019 # https://a.yandex-team.ru/arc/trunk/arcadia/build/ya.conf.json?rev=r7910792#L2185 @@ -201,7 +191,6 @@ _MSVC_FLAGS+=/permissive- _MSVC_FLAGS+=$_MSVC_FLAGS_ARCH_OPT _MSVC_FLAGS+=$_MSVC_FLAGS_CLANG _MSVC_FLAGS+=$_MSVC_FLAGS_CLANG_ARCH -_MSVC_FLAGS+=$_MSVC_FLAGS_CLANG_NO_WARNINGS _MSVC_FLAGS+=$_MSVC_FLAGS_CLANG_EQ_2019 _MSVC_FLAGS+=$_MSVC_FLAGS_INCLUDE @@ -269,10 +258,21 @@ CFLAGS+=$_CFLAGS_UCRT_VC_INCLUDES when ($NO_WSHADOW == "yes") { C_WARNING_OPTS+=/wd4456 /wd4457 } + when ($NO_COMPILER_WARNINGS == "yes") { C_WARNING_OPTS=/w - CXX_WARNING_OPTS= + when ($CLANG_CL == "yes") { + # Though /w is intended to switch off all the warnings, + # it does not switch at least -Wregister and -Wreserved-user-defined-literal under clang-cl. + # + # Use -Wno-everything to force warning suppression. + CXX_WARNING_OPTS=-Wno-everything + } + otherwise { + CXX_WARNING_OPTS= + } } + when ($NO_OPTIMIZE == "yes") { OPTIMIZE=/Od } |