diff options
| author | akhropov <akhropov@yandex-team.com> | 2024-10-08 08:33:37 +0300 |
|---|---|---|
| committer | akhropov <akhropov@yandex-team.com> | 2024-10-08 08:43:30 +0300 |
| commit | 775463dffb5966ca169d17cc53e45ea7101d05e3 (patch) | |
| tree | bbdc5dd1b8422f84021db8273e5dec202de4d740 | |
| parent | e9cdc6695e9950caa3a06e4552c03357809481b3 (diff) | |
| download | ydb-775463dffb5966ca169d17cc53e45ea7101d05e3.tar.gz | |
Revert rXXXXXX 'Enable default manifest once more -- better' as it breaks CatBoost open source build.
commit_hash:1ad09dad049e8da48041d12ed6689dd70037dc84
| -rw-r--r-- | build/conf/linkers/msvc_linker.conf | 9 | ||||
| -rw-r--r-- | build/ymake.core.conf | 9 |
2 files changed, 5 insertions, 13 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= diff --git a/build/ymake.core.conf b/build/ymake.core.conf index 6fcb0e14f6..2661bd5bac 100644 --- a/build/ymake.core.conf +++ b/build/ymake.core.conf @@ -5697,20 +5697,19 @@ when (!$TENSORRT_VERSION) { ANDROID_APK_TEST_ACTIVITY_VALUE=com.yandex.test.unittests/.RunTestsActivity # tag:windows-specific -WINDOWS_MANIFEST=${ARCADIA_ROOT}/build/long-path.manifest +WINDOWS_MANIFEST= macro WINDOWS_MANIFEST(Manifest) { SET(WINDOWS_MANIFEST $Manifest) } -# tag:deprecated # https://docs.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation#enable-long-paths-in-windows-10-version-1607-and-later macro WINDOWS_LONG_PATH_MANIFEST() { - ENABLE(UNUSED_MACRO) + SET(WINDOWS_MANIFEST build/long-path.manifest) } # tag:windows-specific -macro DISABLE_WINDOWS_MANIFEST() { - SET(WINDOWS_MANIFEST) +when ($MSVC == "yes" && $WINDOWS_MANIFEST) { + LDFLAGS+=/MANIFEST:EMBED /MANIFESTINPUT:${input:WINDOWS_MANIFEST} } # tag:cpp-specific |