aboutsummaryrefslogtreecommitdiffstats
path: root/build/conf/linkers
diff options
context:
space:
mode:
authorsnermolaev <snermolaev@yandex-team.com>2024-05-13 09:44:28 +0300
committersnermolaev <snermolaev@yandex-team.com>2024-05-13 09:58:21 +0300
commit5946aa7d3cbca62f6bcf074e8a2b9346e7a96af4 (patch)
tree408160daf5a1e81c8e1979376b39e7fc8d8b7a27 /build/conf/linkers
parent13da969e82a038d8243e1f49a72da257b0458dee (diff)
downloadydb-5946aa7d3cbca62f6bcf074e8a2b9346e7a96af4.tar.gz
fix whitespaces for C_COMPILER, CXX_COMPILER and others for new commands
c781871db335669972c6a05caa74f31990dd1cbd
Diffstat (limited to 'build/conf/linkers')
-rw-r--r--build/conf/linkers/ld.conf8
-rw-r--r--build/conf/linkers/msvc_linker.conf4
2 files changed, 6 insertions, 6 deletions
diff --git a/build/conf/linkers/ld.conf b/build/conf/linkers/ld.conf
index 4fc8b1eb9c..809d02d387 100644
--- a/build/conf/linkers/ld.conf
+++ b/build/conf/linkers/ld.conf
@@ -201,7 +201,7 @@ REAL_LINK_EXE_CMDLINE+=\
${pre=--whole-archive-libs :_WHOLE_ARCHIVE_LIBS_VALUE_GLOBAL} \
$_LD_ARCH_FLAG \
$LINK_SCRIPT_EXE_FLAGS \
- $CXX_COMPILER \
+ $CXX_COMPILER_OLD \
$_LD_SRCS_GLOBALS \
$VCS_C_OBJ $_EXTRA_OBJS $AUTO_INPUT -o $TARGET \
$_EXE_FLAGS \
@@ -228,7 +228,7 @@ REAL_LINK_EXEC_DYN_LIB_CMDLINE+=\
${pre=--whole-archive-libs :_WHOLE_ARCHIVE_LIBS_VALUE_GLOBAL} \
$_LD_ARCH_FLAG \
$LINK_DYN_LIB_FLAGS \
- $CXX_COMPILER \
+ $CXX_COMPILER_OLD \
$_LD_SRCS_GLOBALS \
$VCS_C_OBJ $_EXTRA_OBJS $AUTO_INPUT -o $TARGET \
$_EXEC_SHARED_FLAG \
@@ -252,7 +252,7 @@ REAL_LINK_DYN_LIB_CMDLINE+=\
${pre=--whole-archive-libs :_WHOLE_ARCHIVE_LIBS_VALUE_GLOBAL} \
$_LD_ARCH_FLAG \
$LINK_DYN_LIB_FLAGS \
- $CXX_COMPILER \
+ $CXX_COMPILER_OLD \
$_LD_SRCS_GLOBALS \
$VCS_C_OBJ $_EXTRA_OBJS $AUTO_INPUT -o $TARGET \
$_SHARED_FLAG \
@@ -358,7 +358,7 @@ _LD_LINK_FAT_SUFFIX1=$_LD_ARCH_FLAG \
-Ya,global_srcs
_LD_LINK_FAT_SUFFIX2=-Ya,peers $PEERS \
- -Ya,linker $CXX_COMPILER \
+ -Ya,linker $CXX_COMPILER_OLD \
$LDFLAGS_GLOBAL $C_FLAGS_PLATFORM $LD_SDK_VERSION \
-Ya,archiver $_LD_ARCHIVER \
$TOOLCHAIN_ENV ${kv;hide:"p LD"} ${kv;hide:"pc light-blue"} ${kv;hide:"show_out"}
diff --git a/build/conf/linkers/msvc_linker.conf b/build/conf/linkers/msvc_linker.conf
index 79886b3dc5..6ed23489ca 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} ${quo:_MSVC_LINK_UNQUOTED}
-LINK_LIB_CMD=${_WINE_LIB_PREFIX} ${quo:_MSVC_LIB_UNQUOTED}
+LINK_EXE_CMD=${_WINE_LINK_PREFIX} ${_MSVC_LINK_OLD}
+LINK_LIB_CMD=${_WINE_LIB_PREFIX} ${_MSVC_LIB_OLD}
_MSVC_ARCH=
when ($ARCH_I386 == "yes" || $ARCH_I686 == "yes") {