fix whitespaces for C_COMPILER, CXX_COMPILER and others for new commands

c781871db335669972c6a05caa74f31990dd1cbd

5 files changed, 18 insertions, 17 deletions

diff --git a/build/conf/compilers/gnu_compiler.conf b/build/conf/compilers/gnu_compiler.conf
index a76d99a9fe..bead447583 100644
--- a/build/conf/compilers/gnu_compiler.conf
+++ b/build/conf/compilers/gnu_compiler.conf
@@ -38,7 +38,6 @@ when ($FORCE_NO_PIC == "yes") {
     }
 }
 
-C_COMPILER=${quo:C_COMPILER_UNQUOTED}
 OPTIMIZE=$_OPTIMIZE_RELEASE
 FSTACK=-fstack-protector
 DUMP_DEPS=
@@ -76,7 +75,6 @@ when ($OS_EMSCRIPTEN == "yes") {
 CFLAGS+=$_C_FLAGS $DEBUG_INFO_FLAGS $_C_FOPTIONS $C_WARNING_OPTS $GCC_PREPROCESSOR_OPTS $USER_CFLAGS $USER_CFLAGS_GLOBAL
 CXXFLAGS+=$CFLAGS $_STD_CXX $CXX_WARNING_OPTS $USER_CXXFLAGS $USER_CXXFLAGS_GLOBAL
 CONLYFLAGS+=$USER_CONLYFLAGS $USER_CONLYFLAGS_GLOBAL
-CXX_COMPILER=${quo:CXX_COMPILER_UNQUOTED}
 NOGCCSTACKCHECK=yes
 SFDL_FLAG=$_SFDL_FLAGS -o $SFDL_TMP_OUT
 WERROR_FLAG=-Werror
@@ -194,7 +192,7 @@ _CPP_ARGS=\
     $CLANG_TIDY_ARGS \
     $YNDEXER_ARGS \
     $RETRY_ARGS \
-    $CXX_COMPILER \
+    $CXX_COMPILER_OLD \
     $C_FLAGS_PLATFORM \
     $GCC_COMPILE_FLAGS \
     $CXXFLAGS \
@@ -240,7 +238,7 @@ _C_ARGS=\
     $CLANG_TIDY_ARGS \
     $YNDEXER_ARGS \
     $RETRY_ARGS \
-    $C_COMPILER \
+    $C_COMPILER_OLD \
     $C_FLAGS_PLATFORM \
     $GCC_COMPILE_FLAGS \
     $CFLAGS \
diff --git a/build/conf/compilers/msvc_compiler.conf b/build/conf/compilers/msvc_compiler.conf
index 7ea002c025..f15798f21d 100644
--- a/build/conf/compilers/msvc_compiler.conf
+++ b/build/conf/compilers/msvc_compiler.conf
@@ -1,8 +1,11 @@
 _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}
+C_COMPILER=${_WINE_C_PREFIX} ${C_COMPILER_UNQUOTED}
+C_COMPILER_OLD=${_WINE_C_PREFIX} ${quo:C_COMPILER_OLD_UNQUOTED}
+CXX_COMPILER=${_WINE_CXX_PREFIX} ${CXX_COMPILER_UNQUOTED}
+CXX_COMPILER_OLD=${_WINE_CXX_PREFIX} ${quo:CXX_COMPILER_OLD_UNQUOTED}
+MASM_COMPILER=${_WINE_MASM_PREFIX} ${MASM_COMPILER_UNQUOTED}
+MASM_COMPILER_OLD=${_WINE_MASM_PREFIX} ${quo:MASM_COMPILER_OLD_UNQUOTED}
 
 MSVC_INLINE_OPTIMIZED=yes
 when ($MSVC_INLINE_OPTIMIZED == "yes") {
@@ -96,10 +99,10 @@ _C_CPP_KV_STYLE_P=p CC
 _C_CPP_KV_STYLE_PC=pc yellow
 
 _SRC_C_NODEPS_CMD=${TOOLCHAIN_ENV} ${CL_WRAPPER} ${C_COMPILER} /c /Fo${OUTFILE} ${SRC} ${EXTRA_C_FLAGS} ${pre=/I :INC} ${CFLAGS} ${hide;kv:"soe"} ${hide;kv:"p CC"} ${hide;kv:"pc yellow"}
-_SRC_CPP_CMD=${TOOLCHAIN_ENV} ${CL_WRAPPER} ${CXX_COMPILER} /c /Fo$_COMPILE_OUTPUTS ${input:SRC} ${EXTRA_C_FLAGS} ${pre=/I :_C__INCLUDE} ${CXXFLAGS} ${SRCFLAGS} ${_LANG_CFLAGS_VALUE} ${hide;kv:"soe"} ${hide;kv:"p CC"} ${hide;kv:"pc yellow"}
+_SRC_CPP_CMD=${TOOLCHAIN_ENV} ${CL_WRAPPER} ${CXX_COMPILER_OLD} /c /Fo$_COMPILE_OUTPUTS ${input:SRC} ${EXTRA_C_FLAGS} ${pre=/I :_C__INCLUDE} ${CXXFLAGS} ${SRCFLAGS} ${_LANG_CFLAGS_VALUE} ${hide;kv:"soe"} ${hide;kv:"p CC"} ${hide;kv:"pc yellow"}
 _SRC_CPP_CMD_NEW=${TOOLCHAIN_ENV} ${CL_WRAPPER} ${CXX_COMPILER} /c /Fo$_COMPILE_OUTPUTS ${input:SRC} ${EXTRA_C_FLAGS} ${pre=/I :_C__INCLUDE} ${CXXFLAGS} ${SRCFLAGS} ${_LANG_CFLAGS_VALUE_NEW} ${hide;kv:"soe"} ${hide;kv:_C_CPP_KV_STYLE_P} ${hide;kv:_C_CPP_KV_STYLE_PC}
 _SRC_CPP_CMD_NEW_FORCED=${TOOLCHAIN_ENV} ${CL_WRAPPER} ${CXX_COMPILER} /c /Fo$_COMPILE_OUTPUTS ${input:SRC} ${EXTRA_C_FLAGS} ${pre=/I :_C__INCLUDE} ${CXXFLAGS} $_FORCE_CPP_FLAGS ${SRCFLAGS} ${_LANG_CFLAGS_VALUE_NEW} ${hide;kv:"soe"} ${hide;kv:_C_CPP_KV_STYLE_P} ${hide;kv:_C_CPP_KV_STYLE_PC}
-_SRC_C_CMD=${TOOLCHAIN_ENV} ${CL_WRAPPER} ${C_COMPILER} /c /Fo$_COMPILE_OUTPUTS ${input:SRC} ${EXTRA_C_FLAGS} ${pre=/I :_C__INCLUDE} ${CFLAGS} ${CONLYFLAGS} ${SRCFLAGS} ${hide;kv:"soe"} ${hide;kv:"p CC"} ${hide;kv:"pc yellow"}
+_SRC_C_CMD=${TOOLCHAIN_ENV} ${CL_WRAPPER} ${C_COMPILER_OLD} /c /Fo$_COMPILE_OUTPUTS ${input:SRC} ${EXTRA_C_FLAGS} ${pre=/I :_C__INCLUDE} ${CFLAGS} ${CONLYFLAGS} ${SRCFLAGS} ${hide;kv:"soe"} ${hide;kv:"p CC"} ${hide;kv:"pc yellow"}
 _SRC_C_CMD_NEW=${TOOLCHAIN_ENV} ${CL_WRAPPER} ${C_COMPILER} /c /Fo$_COMPILE_OUTPUTS ${input:SRC} ${EXTRA_C_FLAGS} ${pre=/I :_C__INCLUDE} ${CFLAGS} ${CONLYFLAGS} ${SRCFLAGS} ${hide;kv:"soe"} ${hide;kv:_C_CPP_KV_STYLE_P} ${hide;kv:_C_CPP_KV_STYLE_PC}
 _SRC_M_CMD=$_EMPTY_CMD
-_SRC_MASM_CMD=${cwd:ARCADIA_BUILD_ROOT} ${TOOLCHAIN_ENV} ${ML_WRAPPER} ${MASM_COMPILER} ${MASMFLAGS} ${SRCFLAGS} $_MASM_IO ${kv;hide:"p AS"} ${kv;hide:"pc yellow"}
+_SRC_MASM_CMD=${cwd:ARCADIA_BUILD_ROOT} ${TOOLCHAIN_ENV} ${ML_WRAPPER} ${MASM_COMPILER_OLD} ${MASMFLAGS} ${SRCFLAGS} $_MASM_IO ${kv;hide:"p AS"} ${kv;hide:"pc yellow"}
diff --git a/build/conf/go.conf b/build/conf/go.conf
index c4b5d59894..a12d7b8e6a 100644
--- a/build/conf/go.conf
+++ b/build/conf/go.conf
@@ -216,7 +216,7 @@ macro _GO_COMPILE_CGO1(NAME, FLAGS[], FILES...) {
 
 # tag:go-specific
 macro _GO_COMPILE_CGO2(NAME, C_FILES[], S_FILES[], OBJ_FILES[], FILES...) {
-    .CMD=${hide:_CGO_FAKEID} $C_COMPILER $C_FLAGS_PLATFORM ${pre=-I:_C__INCLUDE} $CGO_CFLAGS_VALUE ${input;tobindir:"_cgo_main.c"} -c -o ${tmp;noauto;suf=${OBJECT_SUF}:"_cgo_main.c"} && $C_COMPILER $C_FLAGS_PLATFORM ${pre=-I:_C__INCLUDE} -o ${tmp;noauto;suf=${OBJECT_SUF}:"_cgo_"} $LDFLAGS $LDFLAGS_GLOBAL $CGO2_LDFLAGS_VALUE ${input;hide:"_cgo_export.h"} ${tmp;noauto;suf=${OBJECT_SUF}:"_cgo_main.c"} ${input;suf=${OBJECT_SUF}:"_cgo_export.c"} ${input;nopath;noext;suf=.cgo2.c${OBJECT_SUF}:FILES} ${input;suf=${OBJECT_SUF}:C_FILES} ${input;suf=.o:S_FILES} ${input:OBJ_FILES} $CGO_LDFLAGS_VALUE && ${GO_TOOLS_ROOT}/pkg/tool/$_GO_TC_PATH/cgo -dynpackage $NAME -dynimport ${tmp;noauto;suf=${OBJECT_SUF}:"_cgo_"} -dynout ${output:"_cgo_import.go"} -dynlinker $GO_CGO2_FLAGS_VALUE $GO_TOOLCHAIN_ENV ${kv;hide:"p go"} ${kv;hide:"pc light-blue"} ${kv;hide:"show_out"}
+    .CMD=${hide:_CGO_FAKEID} $C_COMPILER_OLD $C_FLAGS_PLATFORM ${pre=-I:_C__INCLUDE} $CGO_CFLAGS_VALUE ${input;tobindir:"_cgo_main.c"} -c -o ${tmp;noauto;suf=${OBJECT_SUF}:"_cgo_main.c"} && $C_COMPILER $C_FLAGS_PLATFORM ${pre=-I:_C__INCLUDE} -o ${tmp;noauto;suf=${OBJECT_SUF}:"_cgo_"} $LDFLAGS $LDFLAGS_GLOBAL $CGO2_LDFLAGS_VALUE ${input;hide:"_cgo_export.h"} ${tmp;noauto;suf=${OBJECT_SUF}:"_cgo_main.c"} ${input;suf=${OBJECT_SUF}:"_cgo_export.c"} ${input;nopath;noext;suf=.cgo2.c${OBJECT_SUF}:FILES} ${input;suf=${OBJECT_SUF}:C_FILES} ${input;suf=.o:S_FILES} ${input:OBJ_FILES} $CGO_LDFLAGS_VALUE && ${GO_TOOLS_ROOT}/pkg/tool/$_GO_TC_PATH/cgo -dynpackage $NAME -dynimport ${tmp;noauto;suf=${OBJECT_SUF}:"_cgo_"} -dynout ${output:"_cgo_import.go"} -dynlinker $GO_CGO2_FLAGS_VALUE $GO_TOOLCHAIN_ENV ${kv;hide:"p go"} ${kv;hide:"pc light-blue"} ${kv;hide:"show_out"}
 
     _USE_LINKER()
 }
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") {