aboutsummaryrefslogtreecommitdiffstats
path: root/build/conf/toolchains
diff options
context:
space:
mode:
authorsnermolaev <snermolaev@yandex-team.com>2024-03-11 05:17:13 +0300
committersnermolaev <snermolaev@yandex-team.com>2024-03-11 05:37:08 +0300
commit1041341d148dcfa9aae4928131380c160936514d (patch)
tree02707ebf18f18d1a40bdadd2ca849080561eac0e /build/conf/toolchains
parent27deb40acd9c3798fe9ab7c88e50d532bccf924a (diff)
downloadydb-1041341d148dcfa9aae4928131380c160936514d.tar.gz
respect whitespaces in paths to tools
621356531cf85b8487463c8df871341bed1171f9
Diffstat (limited to 'build/conf/toolchains')
-rw-r--r--build/conf/toolchains/msvc_toolchain.conf17
1 files changed, 15 insertions, 2 deletions
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}
}