Revert "fix build with system clang".

commit_hash:1cdc6fd03063edfc859553c8f9ec25206a9cf9b6

Author: pg

build/conf/compilers/gnu_compiler.conf

@@ -263,6 +263,7 @@ _CPP_ARGS_NEW=\
     $SRCFLAGS \
     $_LANG_CFLAGS_VALUE_NEW \
     ${input:SRC} \
+    $TOOLCHAIN_ENV \
     $CPPYNDEXER_OUTPUT \
     && $_COMPILER_TIME_TRACE_POSTPROCESS \
     $_C_CPP_KV_STYLE_NEW
@@ -283,6 +284,7 @@ _C_ARGS_NEW=\
     $EXTRA_OUTPUT \
     $SRCFLAGS \
     ${input:SRC} \
+    $TOOLCHAIN_ENV \
     $CPPYNDEXER_OUTPUT \
     $_C_CPP_KV_STYLE_NEW \
     $SCU_NAME_KV_NEW
@@ -305,6 +307,7 @@ _SRC_C_NODEPS_CMD=\
     $EXTRA_C_FLAGS -c -o ${OUTFILE} ${SRC} ${pre=-I:INC} \
     $CFLAGS \
     $CONLYFLAGS \
+    $TOOLCHAIN_ENV \
     $_C_CPP_KV_STYLE
 
 _FORCE_CPP_FLAGS=-x c++

build/conf/linkers/ld.conf

@@ -191,7 +191,7 @@ when ($OS_LINUX == "yes") {
     _EXEC_SHARED_FLAG=-pie -fPIE -Wl,--unresolved-symbols=ignore-all -rdynamic
 }
 
-_LD_ENV_STYLE=${cwd:ARCADIA_BUILD_ROOT} ${hide;kv:"p LD"} ${hide;kv:"pc light-blue"} ${hide;kv:"show_out"}
+_LD_ENV_STYLE=${cwd:ARCADIA_BUILD_ROOT} $TOOLCHAIN_ENV ${hide;kv:"p LD"} ${hide;kv:"pc light-blue"} ${hide;kv:"show_out"}
 _ROOT_FLAGS=--source-root $ARCADIA_ROOT --build-root $(BUILD_ROOT)
 
 # Program
@@ -369,7 +369,7 @@ when ($_AR_PLUGIN != "") {
 }
 
 _LD_LINK_LIB_EXTRA_INPUT=
-_LD_TAIL_LINK_LIB=$AUTO_INPUT $_LD_LINK_LIB_EXTRA_INPUT ${hide;kv:"p AR"} ${hide;kv:"pc light-red"} ${hide;kv:"show_out"}
+_LD_TAIL_LINK_LIB=$AUTO_INPUT $_LD_LINK_LIB_EXTRA_INPUT ${hide;kv:"p AR"} $TOOLCHAIN_ENV ${hide;kv:"pc light-red"} ${hide;kv:"show_out"}
 _LD_ARCHIVER=$YMAKE_PYTHON3 ${input:"build/scripts/link_lib.py"} ${quo:AR_TOOL} $AR_TYPE $_LD_LLVM_AR_FORMAT $ARCADIA_BUILD_ROOT $_LD_AR_PLUGIN -- $_LD_ARCHIVER_KV_PLUGIN --
 
 _LD_LIB_GENERATE_MF=$GENERATE_MF &&
@@ -400,7 +400,7 @@ _LD_LINK_FAT_SUFFIX2=-Ya,peers $PEERS \
     -Ya,linker $CXX_COMPILER_OLD \
     $LDFLAGS_GLOBAL $C_FLAGS_PLATFORM $LD_SDK_VERSION \
     -Ya,archiver $_LD_ARCHIVER \
-    ${hide;kv:"p LD"} ${hide;kv:"pc light-blue"} ${hide;kv:"show_out"}
+    $TOOLCHAIN_ENV ${hide;kv:"p LD"} ${hide;kv:"pc light-blue"} ${hide;kv:"show_out"}
 
 LINK_FAT_OBJECT=\
     $_LD_LINK_FAT_PREFIX \

build/ymake.core.conf

@@ -3143,7 +3143,7 @@ macro _SRC("rodata", SRC, SRCFLAGS...) {
 
 macro _SRC_S_ASM(SRC, SRCFLAGS...) {
     # The cwd specification is necessary to ensure that the distbuild output is the same as the local one
-    .CMD=${cwd:ARCADIA_BUILD_ROOT} $C_COMPILER $C_FLAGS_PLATFORM $CFLAGS $SFLAGS $SRCFLAGS -c -o ${output;suf=.o:SRC} ${input:SRC} ${pre=-I:_C__INCLUDE} ${hide;kv:"p AS"} ${hide;kv:"pc light-green"}
+    .CMD=${cwd:ARCADIA_BUILD_ROOT} $C_COMPILER $C_FLAGS_PLATFORM $CFLAGS $SFLAGS $SRCFLAGS -c -o ${output;suf=.o:SRC} ${input:SRC} $TOOLCHAIN_ENV ${pre=-I:_C__INCLUDE} ${hide;kv:"p AS"} ${hide;kv:"pc light-green"}
     .SEM=target_options-privates-ITEM && target_options-privates-option target_sources && target_options-privates-args ${input:SRC} ${hide;output;suf=${OBJ_SUF}.o:SRC} && project_languages ASM
 }
 
@@ -3166,12 +3166,12 @@ macro _SRC("s79", SRC, SRCFLAGS...) {
 
 # tag:src-processing
 macro _SRC("mm", SRC, SRCFLAGS...) {
-    .CMD=$C_COMPILER $C_FLAGS_PLATFORM -x objective-c++ -fobjc-arc -fobjc-abi-version=2 -c -o ${output;suf=.o:SRC} ${input:SRC} $CXXFLAGS ${pre=-I:_C__INCLUDE} ${SRCFLAGS} ${hide;kv:"p CC"} ${hide;kv:"pc light-green"}
+    .CMD=$C_COMPILER $C_FLAGS_PLATFORM -x objective-c++ -fobjc-arc -fobjc-abi-version=2 -c -o ${output;suf=.o:SRC} ${input:SRC} $CXXFLAGS ${pre=-I:_C__INCLUDE} ${SRCFLAGS} ${hide;kv:"p CC"} ${hide;kv:"pc light-green"} $TOOLCHAIN_ENV
 }
 
 # tag:src-processing
 macro _SRC("sfdl", SRC, SRCFLAGS...) {
-    .CMD=$CXX_COMPILER $C_FLAGS_PLATFORM $CXXFLAGS $SFDL_FLAG ${SRCFLAGS} ${input:SRC} && ${tool:"tools/calcstaticopt"} -i ${tmp;suf=.tmp:SRC} -a $ARCADIA_ROOT ${stdout;output;defext=.inc;nopath;noext:SRC} ${hide;kv:"p SF"} ${hide;kv:"pc yellow"}
+    .CMD=$CXX_COMPILER $C_FLAGS_PLATFORM $CXXFLAGS $SFDL_FLAG ${SRCFLAGS} ${input:SRC} && ${tool:"tools/calcstaticopt"} -i ${tmp;suf=.tmp:SRC} -a $ARCADIA_ROOT ${stdout;output;defext=.inc;nopath;noext:SRC} ${hide;kv:"p SF"} ${hide;kv:"pc yellow"} $TOOLCHAIN_ENV
 }
 
 macro _XS_SRCS(SRC, TYPEMAPS[], SRCFLAGS...) {