respect whitespaces in paths to tools

621356531cf85b8487463c8df871341bed1171f9

3 files changed, 30 insertions, 8 deletions

diff --git a/build/conf/compilers/msvc_compiler.conf b/build/conf/compilers/msvc_compiler.conf
index 9455570d59..9725dece3c 100644
--- a/build/conf/compilers/msvc_compiler.conf
+++ b/build/conf/compilers/msvc_compiler.conf
@@ -1,5 +1,9 @@
 _STD_CXX=/std:$_STD_CXX_VERSION
 
+C_COMPILER=${_WINE_C_PREFIX} ${quo:C_COMPILER_UNQUOTED}
+CXX_COMPILER=${_WINE_CXX_PREFIX} ${quo:CXX_COMPILER_UNQUOTED}
+MASM_COMPILER=${_WINE_MASM_PREFIX} ${quo:MASM_COMPILER_UNQUOTED}
+
 MSVC_INLINE_OPTIMIZED=yes
 when ($MSVC_INLINE_OPTIMIZED == "yes") {
     MSVC_INLINE_FLAG=/Zc:inline
@@ -78,9 +82,11 @@ SFDL_FLAG=/E /C /P /TP /Fi$SFDL_TMP_OUT
 WERROR_FLAG=/WX
 
 CL_WRAPPER=${FIX_MSVC_OUTPUT} cl
-ML_WRAPPER=${FIX_MSVC_OUTPUT} ml
-when ($_UNDER_WINE == "yes" && $CLANG_CL !="yes") {
+when ($_UNDER_WINE_COMPILER == "yes" || $CLANG_CL == "yes") {
     CL_WRAPPER=
+}
+ML_WRAPPER=${FIX_MSVC_OUTPUT} ml
+when ($_UNDER_WINE_TOOLS == "yes") {
     ML_WRAPPER=
 }
 
diff --git a/build/conf/linkers/msvc_linker.conf b/build/conf/linkers/msvc_linker.conf
index 27d3a41b20..5c226298eb 100644
--- a/build/conf/linkers/msvc_linker.conf
+++ b/build/conf/linkers/msvc_linker.conf
@@ -1,3 +1,6 @@
+LINK_EXE_CMD=${_WINE_LINK_PREFIX} ${quo:_MSVC_LINK_UNQUOTED}
+LINK_LIB_CMD=${_WINE_LIB_PREFIX} ${quo:_MSVC_LIB_UNQUOTED}
+
 _MSVC_ARCH=
 when ($ARCH_I386 == "yes" || $ARCH_I686 == "yes") {
     _MSVC_ARCH=x86
@@ -43,9 +46,9 @@ when (!$NO_DEBUGINFO || $NO_DEBUGINFO == "no" || $NO_DEBUGINFO == "0") {
 _FLAGS_COMMON_LIBPATHS=
 when ($IDE_MSVS != "yes") {
     _FLAGS_COMMON_LIBPATHS=\
-        /LIBPATH:"$_MSVC_TC_KIT_LIBS/um/$_MSVC_ARCH" \
-        /LIBPATH:"$_MSVC_TC_KIT_LIBS/ucrt/$_MSVC_ARCH" \
-        /LIBPATH:"$_MSVC_TC_VC_ROOT/lib/$_MSVC_ARCH"
+        /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\"
 }
 
 _FLAGS_COMMON =/NOLOGO /ERRORREPORT:PROMPT /SUBSYSTEM:CONSOLE /TLBID:1 $MSVC_DYNAMICBASE /NXCOMPAT
@@ -113,7 +116,7 @@ LINK_EXTRA_OUTPUT=$_LINK_EXTRA_OUTPUT
 
 LIB_WRAPPER=${FIX_MSVC_OUTPUT} lib
 LINK_WRAPPER=${FIX_MSVC_OUTPUT} link
-when ($_UNDER_WINE == "yes") {
+when ($_UNDER_WINE_TOOLS == "yes") {
     LIB_WRAPPER=
     LINK_WRAPPER=
 }
diff --git a/build/conf/toolchains/msvc_toolchain.conf b/build/conf/toolchains/msvc_toolchain.conf
index 6b4d6b5c45..5ae213e275 100644
--- a/build/conf/toolchains/msvc_toolchain.conf
+++ b/build/conf/toolchains/msvc_toolchain.conf
@@ -2,6 +2,19 @@
 # для любых платформ. Нужно унифицировать с GnuToolchain.
 C_FLAGS_PLATFORM=
 
-when ($_UNDER_WINE == "yes") {
-    WINE_ENV=${env:"WINEPREFIX_SUFFIX=4.0"}
+_WINE_CMD=${YMAKE_PYTHON} ${input:"build/scripts/run_msvc_wine.py"} ${input;hide:"build/scripts/process_command_files.py"} ${input;hide:"build/scripts/process_whole_archive_option.py"} $(WINE_TOOL-sbr:1093314933)/bin/wine64 -v140 ${env:"WINEPREFIX_SUFFIX=4.0"}
+
+_WINE_C_PREFIX=
+_WINE_CXX_PREFIX=
+_WINE_LINK_PREFIX=
+_WINE_LIB_PREFIX=
+_WINE_MASM_PREFIX=
+when ($_UNDER_WINE_TOOLS == "yes") {
+    _WINE_LINK_PREFIX=${_WINE_CMD} link ${ARCADIA_ROOT} ${ARCADIA_BUILD_ROOT}
+    _WINE_LIB_PREFIX=${_WINE_CMD} lib ${ARCADIA_ROOT} ${ARCADIA_BUILD_ROOT}
+    _WINE_MASM_PREFIX=${_WINE_CMD} masm ${ARCADIA_ROOT} ${ARCADIA_BUILD_ROOT}
+}
+when ($_UNDER_WINE_COMPILER == "yes") {
+    _WINE_C_PREFIX=${_WINE_CMD} c ${ARCADIA_ROOT} ${ARCADIA_BUILD_ROOT}
+    _WINE_CXX_PREFIX=${_WINE_CMD} cxx ${ARCADIA_ROOT} ${ARCADIA_BUILD_ROOT}
 }