remove crutches for evaluation of vars in cmd .PEERDIR properties
@@ -274,7 +274,7 @@ macro OPTIMIZE_PY_PROTOS() {
macro GO_PROTO_CMD(File) {
.CMD=${cwd;rootdir;input:File} $PROTOC --plugin=protoc-gen-go=${ARCADIA_BUILD_ROOT}/vendor/github.com/golang/protobuf/protoc-gen-go/protoc-gen-go ${tool;hide:"vendor/github.com/golang/protobuf/protoc-gen-go"} -I=./$PROTO_NAMESPACE -I=$ARCADIA_ROOT/$PROTO_NAMESPACE -I=$ARCADIA_BUILD_ROOT -I=$PROTO_PATH --go_out=$ARCADIA_BUILD_ROOT/$PROTO_NAMESPACE ${input;rootrel:File} ${output;hide;noauto;norel;noext;suf=.pb.go:File} ${kv;hide:"p PT"} ${kv;hide:"pc yellow"}
- .PEERDIR=$GOSTD_FMT $GOSTD_MATH vendor/github.com/golang/protobuf/proto vendor/github.com/golang/protobuf/protoc-gen-go/descriptor
+ .PEERDIR=${GOSTD}/fmt ${GOSTD}/math vendor/github.com/golang/protobuf/proto vendor/github.com/golang/protobuf/protoc-gen-go/descriptor
}
macro CPP_PROTO_CMD(File) {
@@ -3258,8 +3258,6 @@ when ($HOST_ARCH_X86_64) {
}
GOSTD=contrib/go/_std/src
-GOSTD_FMT=contrib/go/_std/src/fmt
-GOSTD_MATH=contrib/go/_std/src/math
GO_TOOLS_ROOT_UNQUOTED=${GO_TOOLS_RESOURCE_GLOBAL}
GO_TOOLS_ROOT=${quo:GO_TOOLS_ROOT_UNQUOTED}
GO_TEST_MINER=${ARCADIA_BUILD_ROOT}/tools/go_test_miner/go_test_miner ${tool;hide:"tools/go_test_miner"}
