Revert commit rXXXXXX, Revert commit rXXXXXX,GO STRUCT_CMD

commit_hash:220df0a4662e4668a98f50dbfab938b2c331ea41

2 files changed, 12 insertions, 11 deletions

diff --git a/build/conf/go.conf b/build/conf/go.conf
index 23dc650cb5..de2f207cb0 100644
--- a/build/conf/go.conf
+++ b/build/conf/go.conf
@@ -107,8 +107,8 @@ GO_CONTRIB_PROJECT_PREFIX=vendor/
 GO_SKIP_IMPORTS=unsafe C
 GO_VET_INFO_EXT=.vet.out
 GO_VET_REPORT_EXT=.vet.txt
-GO_VET_OUTPUT_INFO=${output;rootrel;hide;pre=${MODULE_PREFIX};suf=${MODULE_SUFFIX}${GO_VET_INFO_EXT}:REALPRJNAME}
-GO_VET_OUTPUT_REPORT=${output;rootrel;hide;pre=${MODULE_PREFIX};suf=${MODULE_SUFFIX}${GO_VET_REPORT_EXT}:REALPRJNAME}
+GO_VET_OUTPUT_INFO=${hide;rootrel;output;pre=${MODULE_PREFIX};suf=${MODULE_SUFFIX}${GO_VET_INFO_EXT}:REALPRJNAME}
+GO_VET_OUTPUT_REPORT=${hide;rootrel;output;pre=${MODULE_PREFIX};suf=${MODULE_SUFFIX}${GO_VET_REPORT_EXT}:REALPRJNAME}
 
 # tag:go-specific tag:codenav
 _GO_YNDEXER_EXT=.ydx.pb2
@@ -225,17 +225,17 @@ GO_TOOL=$YMAKE_PYTHON3 ${input:"build/scripts/go_tool.py"} $_PROCESS_WHOLE_ARCHI
 
 # tag:go-specific
 macro _GO_LINK_LIB_IMPL(CGO_FILES[], EXTRA_INPUTS[], EXTRA_TEXT_INPUTS[], GO_FILES...) {
-    .CMD=${hide:_GO_FAKEID} $GO_TOOL ${hide;input:EXTRA_INPUTS} ${hide;input;context=TEXT:EXTRA_TEXT_INPUTS} --ya-start-command-file $_GO_TOOL_COMMON_FLAGS ++peers ${rootrel;tags_in=local,GO|local,GO_PROTO|local,GO_FBS:PEERS} --ya-end-command-file ${kv;hide:"p GO"} ${kv;hide:"pc light-red"} ${kv;hide:"show_out"}
+    .CMD=${hide:_GO_FAKEID} $GO_TOOL ${hide;input:EXTRA_INPUTS} ${hide;context=TEXT;input:EXTRA_TEXT_INPUTS} --ya-start-command-file $_GO_TOOL_COMMON_FLAGS ++peers ${rootrel;tags_in=local,GO|local,GO_PROTO|local,GO_FBS:PEERS} --ya-end-command-file ${hide;kv:"p GO"} ${hide;kv:"pc light-red"} ${hide;kv:"show_out"}
 }
 
 # tag:go-specific
 macro _GO_LINK_EXE_IMPL(CGO_FILES[], EXTRA_INPUTS[], EXTRA_TEXT_INPUTS[], GO_FILES...) {
-    .CMD=${hide:_GO_FAKEID} $GO_TOOL ${hide;input:EXTRA_INPUTS} ${hide;input;context=TEXT:EXTRA_TEXT_INPUTS} --ya-start-command-file $_GO_TOOL_COMMON_FLAGS ++vcs $VCS_GO $GO_WITH_MUSL $GO_EXTLD ++peers ${rootrel;tags_in=local,GO|local,GO_PROTO|local,GO_FBS:PEERS} ++non-local-peers ${rootrel;tags_in=GO|GO_PROTO|GO_FBS|;tags_out=local:PEERS} ++cgo-peers ${VCS_C_OBJ_RR} ${_EXTRA_OBJS} ${rootrel;tags_out=GO|GO_PROTO|GO_FBS|RESOURCE_LIB:PEERS} --ya-end-command-file ${kv;hide:"p LD"} ${kv;hide:"pc light-red"} ${kv;hide:"show_out"} $_GO_LINK_EXE_EXT_CMD
+    .CMD=${hide:_GO_FAKEID} $GO_TOOL ${hide;input:EXTRA_INPUTS} ${hide;context=TEXT;input:EXTRA_TEXT_INPUTS} --ya-start-command-file $_GO_TOOL_COMMON_FLAGS ++vcs $VCS_GO $GO_WITH_MUSL $GO_EXTLD ++peers ${rootrel;tags_in=local,GO|local,GO_PROTO|local,GO_FBS:PEERS} ++non-local-peers ${rootrel;tags_in=GO|GO_PROTO|GO_FBS|;tags_out=local:PEERS} ++cgo-peers ${VCS_C_OBJ_RR} ${_EXTRA_OBJS} ${rootrel;tags_out=GO|GO_PROTO|GO_FBS|RESOURCE_LIB:PEERS} --ya-end-command-file ${hide;kv:"p LD"} ${hide;kv:"pc light-red"} ${hide;kv:"show_out"} && $_GO_LINK_EXE_EXT_CMD
 }
 
 # tag:go-specific
 macro _GO_LINK_TEST_IMPL(CGO_FILES[], EXTRA_INPUTS[], EXTRA_TEXT_INPUTS[], GO_TEST_FILES[], GO_XTEST_FILES[], GO_FILES...) {
-    .CMD=${hide:_GO_FAKEID} $GO_TOOL ${hide;input:EXTRA_INPUTS} ${hide;input;context=TEXT:EXTRA_TEXT_INPUTS} --ya-start-command-file $_GO_TOOL_COMMON_FLAGS ++vcs $VCS_GO $GO_WITH_MUSL $GO_EXTLD ++test-miner $GO_TEST_MINER ++test-import-path $GO_TEST_IMPORT_PATH ++peers ${rootrel;tags_in=local,GO|local,GO_PROGRAM|local,GO_PROTO|local,GO_FBS:PEERS} ++non-local-peers ${rootrel;tags_in=GO|GO_PROTO|GO_FBS;tags_out=local:PEERS} ++cgo-peers ${VCS_C_OBJ_RR} ${rootrel;tags_out=GO|GO_PROGRAM|GO_PROTO|GO_FBS|RESOURCE_LIB:PEERS} ++test_srcs ${input:GO_TEST_FILES} ++xtest_srcs ${input:GO_XTEST_FILES} ++cover_info $GO_COVER_INFO_VALUE ++skip-tests $_GO_SKIP_TEST_VALUE --ya-end-command-file ${kv;hide:"p GO"} ${kv;hide:"pc light-red"} ${kv;hide:"show_out"}
+    .CMD=${hide:_GO_FAKEID} $GO_TOOL ${hide;input:EXTRA_INPUTS} ${hide;context=TEXT;input:EXTRA_TEXT_INPUTS} --ya-start-command-file $_GO_TOOL_COMMON_FLAGS ++vcs $VCS_GO $GO_WITH_MUSL $GO_EXTLD ++test-miner $GO_TEST_MINER ++test-import-path $GO_TEST_IMPORT_PATH ++peers ${rootrel;tags_in=local,GO|local,GO_PROGRAM|local,GO_PROTO|local,GO_FBS:PEERS} ++non-local-peers ${rootrel;tags_in=GO|GO_PROTO|GO_FBS;tags_out=local:PEERS} ++cgo-peers ${VCS_C_OBJ_RR} ${rootrel;tags_out=GO|GO_PROGRAM|GO_PROTO|GO_FBS|RESOURCE_LIB:PEERS} ++test_srcs ${input:GO_TEST_FILES} ++xtest_srcs ${input:GO_XTEST_FILES} ++cover_info $GO_COVER_INFO_VALUE ++skip-tests $_GO_SKIP_TEST_VALUE --ya-end-command-file ${hide;kv:"p GO"} ${hide;kv:"pc light-red"} ${hide;kv:"show_out"}
 }
 
 # tag:go-specific
@@ -636,7 +636,8 @@ otherwise {
 ### The base module of all golang modules. Defines common properties, dependencies and rules for go build.
 module _GO_BASE_UNIT: _BASE_UNIT {
     .EXTS=.go .gosrc .o .obj .sbom .a .symabis .mf
-    .CMD=TOUCH_UNIT
+    .CMD=$TOUCH_UNIT
+    .STRUCT_CMD=yes
     .NODE_TYPE=Bundle
     .GLOBAL=GO_LDFLAGS OBJADDE_LIB
     .PEERDIR_POLICY=as_build_from
@@ -809,7 +810,7 @@ module _GO_BASE_UNIT: _BASE_UNIT {
 ### Compile Go module as a library suitable for PEERDIR from other Go modules.
 ### Will select Go implementation on PEERDIR to PROTO_LIBRARY.
 module GO_LIBRARY: _GO_BASE_UNIT {
-    .CMD=GO_LINK_LIB
+    .CMD=$GO_LINK_LIB
     .NODE_TYPE=Bundle
     .FINAL_TARGET=no
     SET(_GO_TOOL_MODE lib)
@@ -827,7 +828,7 @@ module GO_LIBRARY: _GO_BASE_UNIT {
 ### Compile and link Go module to an executable program.
 ### Will select Go implementation on PEERDIR to PROTO_LIBRARY.
 module GO_PROGRAM: _GO_BASE_UNIT {
-    .CMD=GO_LINK_EXE
+    .CMD=$GO_LINK_EXE
     .NODE_TYPE=Program
     .PROXY=yes
     .SYMLINK_POLICY=EXE
@@ -887,7 +888,7 @@ module GO_PROGRAM: _GO_BASE_UNIT {
 
 # tag:go-specific
 module _GO_DLL_BASE_UNIT: GO_PROGRAM {
-    .CMD=GO_LINK_DLL
+    .CMD=$GO_LINK_DLL
     .SYMLINK_POLICY=SO
     .ALLOWED=WHOLE_ARCHIVE
     .ARGS_PARSER=DLL
@@ -951,7 +952,7 @@ macro GO_BENCH_TIMEOUT(bench_timeout) {
 ### All usual testing support macros like DATA, DEPENDS, SIZE, REQUIREMENTS etc. are supported.
 ### Will select Go implementation on PEERDIR to PROTO_LIBRARY.
 module GO_TEST: GO_PROGRAM {
-    .CMD=GO_LINK_TEST
+    .CMD=$GO_LINK_TEST
     .ALIASES=GO_TEST_SRCS=GO_TEST_SRCS GO_XTEST_SRCS=GO_XTEST_SRCS GO_TEST_EMBED_PATTERN=GO_TEST_EMBED_PATTERN GO_XTEST_EMBED_PATTERN=GO_XTEST_EMBED_PATTERN GO_TEST_EMBED_DIR=GO_TEST_EMBED_DIR GO_XTEST_EMBED_DIR=GO_XTEST_EMBED_DIR GO_TEST_EMBED_BINDIR=GO_TEST_EMBED_BINDIR GO_XTEST_EMBED_BINDIR=GO_XTEST_EMBED_BINDIR
     .ALLOWED=GO_SKIP_TESTS YT_SPEC
     .FINAL_TARGET=no
diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index 0916dddbba..84987a0ec0 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -2818,7 +2818,7 @@ macro SIZE(Type) {
 ### This macro doesn't place all file into Out, it emits #include<Src>... Use the for C++ source files only.
 ### You should specify file name with the extension as Out. Further processing will be done according this extension.
 macro JOIN_SRCS(Out, Src...) {
-    .CMD=$YMAKE_PYTHON3 ${input:"build/scripts/gen_join_srcs.py"} ${hide;input:"build/scripts/process_command_files.py"} ${output:Out} --ya-start-command-file ${input;rootrel;context=TEXT:Src} --ya-end-command-file ${output_include;from_input;hide:Src} ${hide;kv:"p JS"} ${hide;kv:"pc magenta"}
+    .CMD=$YMAKE_PYTHON3 ${input:"build/scripts/gen_join_srcs.py"} ${hide;input:"build/scripts/process_command_files.py"} ${output:Out} --ya-start-command-file ${context=TEXT;input;rootrel:Src} --ya-end-command-file ${output_include;from_input;hide:Src} ${hide;kv:"p JS"} ${hide;kv:"pc magenta"}
     .SEM=target_joined_source $Out ${input:Src} ${hide;output;suf=.o:Out} ${hide;input:"build/scripts/gen_join_srcs.py"} ${hide;input:"build/scripts/process_command_files.py"} && target_macroses-ITEM && target_macroses-macro target_joined_source && target_macroses-args $Out ${input:Src} ${hide;output;suf=.o:Out} ${hide;input:"build/scripts/gen_join_srcs.py"} ${hide;input:"build/scripts/process_command_files.py"}
     _CONDITIONAL_SRCS($TIDY_VALUE $Src)
 }