diff options
| author | snermolaev <snermolaev@yandex-team.com> | 2024-09-26 05:55:22 +0300 |
|---|---|---|
| committer | snermolaev <snermolaev@yandex-team.com> | 2024-09-26 06:06:35 +0300 |
| commit | 4440a98227783b4462ab9696cde263c46a30fe21 (patch) | |
| tree | 3d0d50e9c08b1b8c214508d333772a61a3410970 | |
| parent | 9d9b3c2112667e97ea76cb18a3689308ab8297c2 (diff) | |
| download | ydb-4440a98227783b4462ab9696cde263c46a30fe21.tar.gz | |
fix OPENSOURCE build for Windows
commit_hash:00eb0ed3e0f485137f5f330033590ff2ecfddc14
| -rw-r--r-- | build/conf/linkers/msvc_linker.conf | 14 | ||||
| -rwxr-xr-x | build/ymake_conf.py | 4 |
2 files changed, 7 insertions, 11 deletions
diff --git a/build/conf/linkers/msvc_linker.conf b/build/conf/linkers/msvc_linker.conf index b2cdfa4cb7..7bba3060ad 100644 --- a/build/conf/linkers/msvc_linker.conf +++ b/build/conf/linkers/msvc_linker.conf @@ -1,5 +1,5 @@ -LINK_EXE_CMD=${_WINE_LINK_PREFIX} ${_MSVC_LINK_OLD} -LINK_LIB_CMD=${_WINE_LIB_PREFIX} ${_MSVC_LIB_OLD} +LINK_EXE_CMD=${_WINE_LINK_PREFIX} ${_MSVC_LINK} +LINK_LIB_CMD=${_WINE_LIB_PREFIX} ${_MSVC_LIB} _MSVC_ARCH= when ($ARCH_I386 == "yes" || $ARCH_I686 == "yes") { @@ -46,9 +46,9 @@ when (!$NO_DEBUGINFO || $NO_DEBUGINFO == "no" || $NO_DEBUGINFO == "0") { _FLAGS_COMMON_LIBPATHS= when ($IDE_MSVS != "yes") { _FLAGS_COMMON_LIBPATHS=\ - /LIBPATH:\"${quo:_MSVC_TC_KIT_LIBS}/um/$_MSVC_ARCH\" \ - /LIBPATH:\"${quo:_MSVC_TC_KIT_LIBS}/ucrt/$_MSVC_ARCH\" \ - /LIBPATH:\"${quo:_MSVC_TC_VC_ROOT}/lib/$_MSVC_ARCH\" + /LIBPATH:\""${_MSVC_TC_KIT_LIBS}/um/$_MSVC_ARCH"\" \ + /LIBPATH:\""${_MSVC_TC_KIT_LIBS}/ucrt/$_MSVC_ARCH"\" \ + /LIBPATH:\""${_MSVC_TC_VC_ROOT}/lib/$_MSVC_ARCH"\" } _FLAGS_COMMON =/NOLOGO /ERRORREPORT:PROMPT /SUBSYSTEM:CONSOLE /TLBID:1 $MSVC_DYNAMICBASE /NXCOMPAT @@ -107,7 +107,7 @@ OBJADDE_LIB_GLOBAL= LINK_EXE_FLAGS=$LINK_EXE_FLAGS_PER_TYPE LINK_EXE_VFS_FLAGS= -when ($_UNDER_WINE_LINK != "yes") { +when ($_UNDER_WINE_LINK != "yes" && $USE_MSVC_LINKER != "yes") { LINK_EXE_VFS_FLAGS=/vfsoverlay:${BINDIR}/vfsoverlay.yaml } LINK_EXE_FLAGS+=${LINK_EXE_VFS_FLAGS} @@ -118,7 +118,7 @@ GENERATE_COMMON_LIB_VFS_CMD=\ ${_FLAGS_COMMON_LIBPATHS} GENERATE_COMMON_LIB_VFS= -when ($_UNDER_WINE_LINK != "yes") { +when ($_UNDER_WINE_LINK != "yes" && $USE_MSVC_LINKER != "yes") { GENERATE_COMMON_LIB_VFS=${GENERATE_COMMON_LIB_VFS_CMD} } diff --git a/build/ymake_conf.py b/build/ymake_conf.py index 15ce77b1f9..6e53ddf856 100755 --- a/build/ymake_conf.py +++ b/build/ymake_conf.py @@ -2175,11 +2175,7 @@ class MSVCLinker(MSVC, Linker): linker_lib = self.tc.lib emit('_MSVC_LIB', '"{}"'.format(linker_lib)) - emit('_MSVC_LIB_OLD_UNQUOTED', linker_lib) - emit('_MSVC_LIB_OLD', '${quo:_MSVC_LIB_OLD_UNQUOTED}') emit('_MSVC_LINK', '"{}"'.format(linker)) - emit('_MSVC_LINK_OLD_UNQUOTED', linker) - emit('_MSVC_LINK_OLD', '${quo:_MSVC_LINK_OLD_UNQUOTED}') if self.build.is_release: emit('LINK_EXE_FLAGS_PER_TYPE', '$LINK_EXE_FLAGS_RELEASE') |