diff options
| author | snermolaev <snermolaev@yandex-team.com> | 2024-10-07 08:31:07 +0300 |
|---|---|---|
| committer | snermolaev <snermolaev@yandex-team.com> | 2024-10-07 08:45:17 +0300 |
| commit | fc944431534d9c616933f5c629271bad64d517e5 (patch) | |
| tree | 710360aa375775790a884e190c9316ecb27fe741 | |
| parent | 37687cf7e3ec8945ff72f267633b5753b26fb7e9 (diff) | |
| download | ydb-fc944431534d9c616933f5c629271bad64d517e5.tar.gz | |
Enable default manifest once more -- better
commit_hash:761205b33ca8652acda8371d2cec410c99a02cef
| -rw-r--r-- | build/conf/linkers/msvc_linker.conf | 9 | ||||
| -rw-r--r-- | build/ymake.core.conf | 9 |
2 files changed, 13 insertions, 5 deletions
diff --git a/build/conf/linkers/msvc_linker.conf b/build/conf/linkers/msvc_linker.conf index 7bba3060ad..2e9bfe7081 100644 --- a/build/conf/linkers/msvc_linker.conf +++ b/build/conf/linkers/msvc_linker.conf @@ -51,6 +51,13 @@ 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 @@ -100,7 +107,7 @@ LINK_STDLIBS=\ ws2_32.lib LDFLAGS_GLOBAL= -LDFLAGS= +LDFLAGS=$_FLAGS_MANIFEST OBJADDE= OBJADDE_LIB= OBJADDE_LIB_GLOBAL= diff --git a/build/ymake.core.conf b/build/ymake.core.conf index 2661bd5bac..6fcb0e14f6 100644 --- a/build/ymake.core.conf +++ b/build/ymake.core.conf @@ -5697,19 +5697,20 @@ when (!$TENSORRT_VERSION) { ANDROID_APK_TEST_ACTIVITY_VALUE=com.yandex.test.unittests/.RunTestsActivity # tag:windows-specific -WINDOWS_MANIFEST= +WINDOWS_MANIFEST=${ARCADIA_ROOT}/build/long-path.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() { - SET(WINDOWS_MANIFEST build/long-path.manifest) + ENABLE(UNUSED_MACRO) } # tag:windows-specific -when ($MSVC == "yes" && $WINDOWS_MANIFEST) { - LDFLAGS+=/MANIFEST:EMBED /MANIFESTINPUT:${input:WINDOWS_MANIFEST} +macro DISABLE_WINDOWS_MANIFEST() { + SET(WINDOWS_MANIFEST) } # tag:cpp-specific |