Skip to content

Commit fc94443

Browse files
committed
Enable default manifest once more -- better
commit_hash:761205b33ca8652acda8371d2cec410c99a02cef
1 parent 37687cf commit fc94443

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

build/conf/linkers/msvc_linker.conf

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,13 @@ when ($IDE_MSVS != "yes") {
5151
/LIBPATH:\""${_MSVC_TC_VC_ROOT}/lib/$_MSVC_ARCH"\"
5252
}
5353

54+
when ($WINDOWS_MANIFEST != "") {
55+
_FLAGS_MANIFEST=/MANIFEST:EMBED /MANIFESTINPUT:${input:WINDOWS_MANIFEST}
56+
}
57+
otherwise {
58+
_FLAGS_MANIFEST=
59+
}
60+
5461
_FLAGS_COMMON =/NOLOGO /ERRORREPORT:PROMPT /SUBSYSTEM:CONSOLE /TLBID:1 $MSVC_DYNAMICBASE /NXCOMPAT
5562
_FLAGS_COMMON+=$_FLAGS_IGNORE
5663
_FLAGS_COMMON+=$_FLAGS_MACHINE
@@ -100,7 +107,7 @@ LINK_STDLIBS=\
100107
ws2_32.lib
101108

102109
LDFLAGS_GLOBAL=
103-
LDFLAGS=
110+
LDFLAGS=$_FLAGS_MANIFEST
104111
OBJADDE=
105112
OBJADDE_LIB=
106113
OBJADDE_LIB_GLOBAL=

build/ymake.core.conf

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5697,19 +5697,20 @@ when (!$TENSORRT_VERSION) {
56975697
ANDROID_APK_TEST_ACTIVITY_VALUE=com.yandex.test.unittests/.RunTestsActivity
56985698

56995699
# tag:windows-specific
5700-
WINDOWS_MANIFEST=
5700+
WINDOWS_MANIFEST=${ARCADIA_ROOT}/build/long-path.manifest
57015701
macro WINDOWS_MANIFEST(Manifest) {
57025702
SET(WINDOWS_MANIFEST $Manifest)
57035703
}
57045704

5705+
# tag:deprecated
57055706
# https://docs.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation#enable-long-paths-in-windows-10-version-1607-and-later
57065707
macro WINDOWS_LONG_PATH_MANIFEST() {
5707-
SET(WINDOWS_MANIFEST build/long-path.manifest)
5708+
ENABLE(UNUSED_MACRO)
57085709
}
57095710

57105711
# tag:windows-specific
5711-
when ($MSVC == "yes" && $WINDOWS_MANIFEST) {
5712-
LDFLAGS+=/MANIFEST:EMBED /MANIFESTINPUT:${input:WINDOWS_MANIFEST}
5712+
macro DISABLE_WINDOWS_MANIFEST() {
5713+
SET(WINDOWS_MANIFEST)
57135714
}
57145715

57155716
# tag:cpp-specific

0 commit comments

Comments
 (0)