aboutsummaryrefslogtreecommitdiffstats
path: root/build/conf
diff options
context:
space:
mode:
authorakhropov <akhropov@yandex-team.com>2024-10-08 08:33:37 +0300
committerakhropov <akhropov@yandex-team.com>2024-10-08 08:43:30 +0300
commit775463dffb5966ca169d17cc53e45ea7101d05e3 (patch)
treebbdc5dd1b8422f84021db8273e5dec202de4d740 /build/conf
parente9cdc6695e9950caa3a06e4552c03357809481b3 (diff)
downloadydb-775463dffb5966ca169d17cc53e45ea7101d05e3.tar.gz
Revert rXXXXXX 'Enable default manifest once more -- better' as it breaks CatBoost open source build.
commit_hash:1ad09dad049e8da48041d12ed6689dd70037dc84
Diffstat (limited to 'build/conf')
-rw-r--r--build/conf/linkers/msvc_linker.conf9
1 files changed, 1 insertions, 8 deletions
diff --git a/build/conf/linkers/msvc_linker.conf b/build/conf/linkers/msvc_linker.conf
index 2e9bfe7081..7bba3060ad 100644
--- a/build/conf/linkers/msvc_linker.conf
+++ b/build/conf/linkers/msvc_linker.conf
@@ -51,13 +51,6 @@ when ($IDE_MSVS != "yes") {
/LIBPATH:\""${_MSVC_TC_VC_ROOT}/lib/$_MSVC_ARCH"\"
}
-when ($WINDOWS_MANIFEST != "") {
- _FLAGS_MANIFEST=/MANIFEST:EMBED /MANIFESTINPUT:${input:WINDOWS_MANIFEST}
-}
-otherwise {
- _FLAGS_MANIFEST=
-}
-
_FLAGS_COMMON =/NOLOGO /ERRORREPORT:PROMPT /SUBSYSTEM:CONSOLE /TLBID:1 $MSVC_DYNAMICBASE /NXCOMPAT
_FLAGS_COMMON+=$_FLAGS_IGNORE
_FLAGS_COMMON+=$_FLAGS_MACHINE
@@ -107,7 +100,7 @@ LINK_STDLIBS=\
ws2_32.lib
LDFLAGS_GLOBAL=
-LDFLAGS=$_FLAGS_MANIFEST
+LDFLAGS=
OBJADDE=
OBJADDE_LIB=
OBJADDE_LIB_GLOBAL=