diff options
| author | mikhnenko <mikhnenko@yandex-team.com> | 2024-12-11 20:11:59 +0300 |
|---|---|---|
| committer | mikhnenko <mikhnenko@yandex-team.com> | 2024-12-11 21:51:32 +0300 |
| commit | a963bf29e8b59750359a0eca8fa2892ab245e3a3 (patch) | |
| tree | cc4b7966f49c5a2832f072cd81df0920e05043f1 | |
| parent | ea93444d24353ae122563e5fe328939b9324542e (diff) | |
| download | ydb-a963bf29e8b59750359a0eca8fa2892ab245e3a3.tar.gz | |
Remove usages of IDE_MSVS in build/**.conf
commit_hash:c1518f043b5d9cd9c2d91978c34552ba77d0ba29
| -rw-r--r-- | build/conf/compilers/msvc_compiler.conf | 6 | ||||
| -rw-r--r-- | build/conf/linkers/msvc_linker.conf | 10 | ||||
| -rw-r--r-- | build/conf/settings.conf | 2 | ||||
| -rw-r--r-- | build/ymake.core.conf | 8 |
4 files changed, 3 insertions, 23 deletions
diff --git a/build/conf/compilers/msvc_compiler.conf b/build/conf/compilers/msvc_compiler.conf index 0d549a05e9c..37e8f840611 100644 --- a/build/conf/compilers/msvc_compiler.conf +++ b/build/conf/compilers/msvc_compiler.conf @@ -20,12 +20,6 @@ _CXX_FLAGS=/Zc:__cplusplus _MSVC_ONLY_FLAGS= DEBUG_INFO_FLAGS=/Z7 -when ($IDE_MSVS == "yes") { - when ($CLANG_CL != "yes") { - _MSVC_ONLY_FLAGS=/FD /MP - } - DEBUG_INFO_FLAGS=/Zi /FS -} CFLAGS_DEBUG = /Od /Ob0 /Oi CFLAGS_RELEASE = /O2 /Ob2 /Oi diff --git a/build/conf/linkers/msvc_linker.conf b/build/conf/linkers/msvc_linker.conf index d235608bca5..926d9c9a881 100644 --- a/build/conf/linkers/msvc_linker.conf +++ b/build/conf/linkers/msvc_linker.conf @@ -16,13 +16,7 @@ _FLAGS_MACHINE=/MACHINE:${toupper:_MSVC_ARCH} _FLAGS_IGNORE=/IGNORE:4221 -_FLAGS_COMMON_IDE_MSVS= -when ($IDE_MSVS == "yes") { - _FLAGS_COMMON_IDE_MSVS=/INCREMENTAL -} -otherwise { - _FLAGS_COMMON_IDE_MSVS=/INCREMENTAL:NO -} +_FLAGS_COMMON_INCREMENTAL=/INCREMENTAL:NO # TODO(nslus): DEVTOOLS-1868 remove restriction. _FLAGS_DEBUG_ONLY_DEBUG= @@ -54,7 +48,7 @@ when ($IDE_MSVS != "yes") { _FLAGS_COMMON =/NOLOGO /ERRORREPORT:PROMPT /SUBSYSTEM:CONSOLE /TLBID:1 $MSVC_DYNAMICBASE /NXCOMPAT _FLAGS_COMMON+=$_FLAGS_IGNORE _FLAGS_COMMON+=$_FLAGS_MACHINE -_FLAGS_COMMON+=$_FLAGS_COMMON_IDE_MSVS +_FLAGS_COMMON+=$_FLAGS_COMMON_INCREMENTAL _FLAGS_COMMON+=$_FLAGS_COMMON_DEBUG _FLAGS_COMMON+=$_FLAGS_COMMON_LIBPATHS diff --git a/build/conf/settings.conf b/build/conf/settings.conf index 40fa8041047..2094fce5c50 100644 --- a/build/conf/settings.conf +++ b/build/conf/settings.conf @@ -67,7 +67,7 @@ _FOLDABLE_VARS=\ _EXE_FLAGS \ _FLAGS_COMMON \ _FLAGS_COMMON_DEBUG \ - _FLAGS_COMMON_IDE_MSVS \ + _FLAGS_COMMON_INCREMENTAL \ _FLAGS_COMMON_LIBPATHS \ _FLAGS_DEBUG_ONLY \ _FLAGS_DEBUG_ONLY_CLANG_CL \ diff --git a/build/ymake.core.conf b/build/ymake.core.conf index 40f99de2e0e..ed6dc8407e8 100644 --- a/build/ymake.core.conf +++ b/build/ymake.core.conf @@ -1206,10 +1206,6 @@ module _BASE_PROGRAM: _LINK_UNIT { PEERDIR+=library/cpp/testing/dump_clang_coverage } - when ($IDE_MSVS == "yes") { - PEERDIR+=build/scripts/c_templates - } - when ($_CUSTOM_LINK_STEP_SCRIPT) { LINK_SCRIPT_EXE_FLAGS+=--python=$YMAKE_PYTHON --custom-step=${input:_CUSTOM_LINK_STEP_SCRIPT} } @@ -2105,10 +2101,6 @@ module DLL_UNIT: _LINK_UNIT { PEERDIR+=library/cpp/testing/dump_clang_coverage } - when ($IDE_MSVS == "yes") { - PEERDIR+=build/scripts/c_templates - } - when ($_CUSTOM_LINK_STEP_SCRIPT) { LINK_DYN_LIB_FLAGS+=--python=$YMAKE_PYTHON --custom-step=${input:_CUSTOM_LINK_STEP_SCRIPT} } |