Enable STRUCT_CMD for C/C++ compilation

b9f14071dcb806a1de47c935d61e40cd7901c8ce

2 files changed, 60 insertions, 1 deletions

diff --git a/build/conf/compilers/gnu_compiler.conf b/build/conf/compilers/gnu_compiler.conf
index 66e0711df7..a76d99a9fe 100644
--- a/build/conf/compilers/gnu_compiler.conf
+++ b/build/conf/compilers/gnu_compiler.conf
@@ -185,6 +185,10 @@ when (($TIME_TRACE == "yes" || $COMPILER_TIME_TRACE == "yes") && $_HAS_TIME_TRAC
 }
 
 _C_CPP_KV_STYLE=${hide;kv:"p CC"} ${hide;kv:"pc green"}
+_C_CPP_KV_STYLE_NEW=${hide;kv:_C_CPP_KV_STYLE_P} ${hide;kv:_C_CPP_KV_STYLE_PC}
+_C_CPP_KV_STYLE_P=p CC
+_C_CPP_KV_STYLE_PC=pc green
+
 _CPP_ARGS=\
     $CLANG_STATIC_ANALYZER_OPTIONS && \
     $CLANG_TIDY_ARGS \
@@ -206,6 +210,32 @@ _CPP_ARGS=\
     && $_COMPILER_TIME_TRACE_POSTPROCESS \
     $_C_CPP_KV_STYLE
 
+_CPP_ARGS_NEW_CMD_0=\
+    $CLANG_STATIC_ANALYZER_OPTIONS_NEW
+
+_CPP_ARGS_NEW_CMD_1_1=\
+    $CLANG_TIDY_ARGS \
+    $YNDEXER_ARGS \
+    $RETRY_ARGS \
+    $CXX_COMPILER \
+    $C_FLAGS_PLATFORM \
+    $GCC_COMPILE_FLAGS \
+    $CXXFLAGS \
+    $CL_MACRO_INFO \
+    $CL_MACRO_INFO_DISABLE_CACHE__NO_UID__ \
+    $_COMPILER_TIME_TRACE_FLAGS \
+    $EXTRA_OUTPUT
+_CPP_ARGS_NEW_CMD_1_2=\
+    $SRCFLAGS \
+    $_LANG_CFLAGS_VALUE_NEW \
+    ${input:SRC} \
+    $TOOLCHAIN_ENV \
+    $YNDEXER_OUTPUT
+_CPP_ARGS_NEW_CMD_2=\
+    $_COMPILER_TIME_TRACE_POSTPROCESS \
+    $_C_CPP_KV_STYLE_NEW \
+    $SCU_NAME_KV_NEW
+
 _C_ARGS=\
     $CLANG_TIDY_ARGS \
     $YNDEXER_ARGS \
@@ -225,6 +255,26 @@ _C_ARGS=\
     $YNDEXER_OUTPUT \
     $_C_CPP_KV_STYLE
 
+_C_ARGS_NEW=\
+    $CLANG_TIDY_ARGS \
+    $YNDEXER_ARGS \
+    $RETRY_ARGS \
+    $C_COMPILER \
+    $C_FLAGS_PLATFORM \
+    $GCC_COMPILE_FLAGS \
+    $CFLAGS \
+    $CL_MACRO_INFO \
+    $CL_MACRO_INFO_DISABLE_CACHE__NO_UID__ \
+    $_COMPILER_TIME_TRACE_FLAGS \
+    $CONLYFLAGS \
+    $EXTRA_OUTPUT \
+    $SRCFLAGS \
+    ${input:SRC} \
+    $TOOLCHAIN_ENV \
+    $YNDEXER_OUTPUT \
+    $_C_CPP_KV_STYLE_NEW \
+    $SCU_NAME_KV_NEW
+
 ### _SRC_C_NODEPS_CMD is obtained from _C_ARGS by filtering the following elements:
 ### ${input:SRC}
 ### $CL_MACRO_INFO
@@ -249,6 +299,9 @@ _SRC_C_NODEPS_CMD=\
 _FORCE_CPP_FLAGS=-x c++
 
 _SRC_CPP_CMD=$_CPP_ARGS
+_SRC_CPP_CMD_NEW=       $_CPP_ARGS_NEW_CMD_0                                           && $_CPP_ARGS_NEW_CMD_1_1                   $_CPP_ARGS_NEW_CMD_1_2 && $_CPP_ARGS_NEW_CMD_2
+_SRC_CPP_CMD_NEW_FORCED=$_CPP_ARGS_NEW_CMD_0 $CLANG_STATIC_ANALYZER_OPTIONS_NEW_FORCED && $_CPP_ARGS_NEW_CMD_1_1 $_FORCE_CPP_FLAGS $_CPP_ARGS_NEW_CMD_1_2 && $_CPP_ARGS_NEW_CMD_2
 _SRC_C_CMD=$_C_ARGS
+_SRC_C_CMD_NEW=$_C_ARGS_NEW
 _SRC_M_CMD=$SRC_c($SRC $SRCFLAGS)
 _SRC_MASM_CMD=$_EMPTY_CMD
diff --git a/build/conf/compilers/msvc_compiler.conf b/build/conf/compilers/msvc_compiler.conf
index 7eacd84c91..8e62e741bb 100644
--- a/build/conf/compilers/msvc_compiler.conf
+++ b/build/conf/compilers/msvc_compiler.conf
@@ -92,8 +92,14 @@ when ($_UNDER_WINE_TOOLS == "yes") {
 
 _FORCE_CPP_FLAGS=/TP
 
+_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;msvs_source: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_C_CMD=${TOOLCHAIN_ENV} ${CL_WRAPPER} ${C_COMPILER} /c /Fo$_COMPILE_OUTPUTS ${input;msvs_source:SRC} ${EXTRA_C_FLAGS} ${pre=/I :_C__INCLUDE} ${CFLAGS} ${CONLYFLAGS} ${SRCFLAGS} ${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 ${msvs_source;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 ${msvs_source;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 ${msvs_source;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 ${msvs_source;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"}