fix OPENSOURCE build for Windows

commit_hash:00eb0ed3e0f485137f5f330033590ff2ecfddc14

Author: snermolaev

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}
 }
 

build/ymake_conf.py

@@ -2175,11 +2175,7 @@ def print_linker(self):
         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')