diff options
| author | mikhnenko <mikhnenko@yandex-team.com> | 2024-05-13 19:05:38 +0300 |
|---|---|---|
| committer | mikhnenko <mikhnenko@yandex-team.com> | 2024-05-13 19:15:54 +0300 |
| commit | 6c78e22d15a1ee71f94637cfafd3e9f502930bef (patch) | |
| tree | e1f32c2a55b6bc6ab4d4d4fda4b036a77c9813e5 /build/conf/linkers | |
| parent | ee1f0b2b864ead167a701a030f064ae9e7278d95 (diff) | |
| download | ydb-6c78e22d15a1ee71f94637cfafd3e9f502930bef.tar.gz | |
Use lld-link for target-platform windows once again
da1125f4b9b5aebe87b610dd1e1a61864ba500cf
Diffstat (limited to 'build/conf/linkers')
| -rw-r--r-- | build/conf/linkers/msvc_linker.conf | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/build/conf/linkers/msvc_linker.conf b/build/conf/linkers/msvc_linker.conf index 6ed23489ca..d0e1db7098 100644 --- a/build/conf/linkers/msvc_linker.conf +++ b/build/conf/linkers/msvc_linker.conf @@ -106,6 +106,21 @@ OBJADDE_LIB= OBJADDE_LIB_GLOBAL= LINK_EXE_FLAGS=$LINK_EXE_FLAGS_PER_TYPE +LINK_EXE_VFS_FLAGS= +when ($_UNDER_WINE_LINK != "yes") { + LINK_EXE_VFS_FLAGS=/vfsoverlay:${BINDIR}/vfsoverlay.yaml +} +LINK_EXE_FLAGS+=${LINK_EXE_VFS_FLAGS} + +GENERATE_COMMON_LIB_VFS_CMD=\ + ${YMAKE_PYTHON3} ${input:"build/scripts/generate_win_vfs.py"} \ + ${BINDIR} \ + ${_FLAGS_COMMON_LIBPATHS} + +GENERATE_COMMON_LIB_VFS= +when ($_UNDER_WINE_LINK != "yes") { + GENERATE_COMMON_LIB_VFS=${GENERATE_COMMON_LIB_VFS_CMD} +} LINK_IMPLIB=/IMPLIB:${output;noext;rootrel;pre=$MODULE_PREFIX:REALPRJNAME.lib} _LINK_EXTRA_OUTPUT= @@ -116,7 +131,7 @@ LINK_EXTRA_OUTPUT=$_LINK_EXTRA_OUTPUT LIB_WRAPPER=${FIX_MSVC_OUTPUT} lib LINK_WRAPPER=${FIX_MSVC_OUTPUT} link -when ($_UNDER_WINE_TOOLS == "yes") { +when ($_UNDER_WINE_LINK == "yes") { LINK_WRAPPER= } when ($_UNDER_WINE_LIB == "yes") { @@ -156,6 +171,7 @@ _MSVC_SRCS_GLOBALS=\ --ya-start-command-file ${qe;rootrel;ext=.obj:SRCS_GLOBAL} --ya-end-command-file REAL_LINK_DYN_LIB_CMDLINE=\ + ${GENERATE_COMMON_LIB_VFS} && \ ${TOOLCHAIN_ENV} \ ${cwd:ARCADIA_BUILD_ROOT} \ ${LINK_WRAPPER} \ @@ -198,6 +214,7 @@ LINK_EXE_CMDLINE=\ ${GENERATE_MF} && \ ${_GENERATE_EXTRA_OBJS} && \ $GENERATE_VCS_C_INFO_NODEP && \ + ${GENERATE_COMMON_LIB_VFS} && \ ${TOOLCHAIN_ENV} \ ${cwd:ARCADIA_BUILD_ROOT} \ ${LINK_WRAPPER} \ @@ -227,6 +244,7 @@ LINK_DYN_LIB=${GENERATE_MF} && $GENERATE_VCS_C_INFO_NODEP && $REAL_LINK_DYN_LIB LINK_EXEC_DYN_LIB_CMDLINE=\ ${GENERATE_MF} && \ $GENERATE_VCS_C_INFO_NODEP && \ + ${GENERATE_COMMON_LIB_VFS} && \ ${TOOLCHAIN_ENV} \ ${cwd:ARCADIA_BUILD_ROOT} \ ${LINK_WRAPPER} \ |