Browse Source

Remove usages of IDE_MSVS in build/**.conf
commit_hash:c1518f043b5d9cd9c2d91978c34552ba77d0ba29

mikhnenko 3 months ago
parent
commit
480e4888d6

+ 0 - 6
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

+ 2 - 8
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
 

+ 1 - 1
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 \

+ 0 - 8
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}
     }