aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoriniklyaev <iniklyaev@yandex-team.com>2025-02-04 10:50:32 +0300
committeriniklyaev <iniklyaev@yandex-team.com>2025-02-04 11:17:41 +0300
commite29ec2cd295da3a1574be2531d545f0d0accdeca (patch)
treecd35056c7d7c367436728ffc1c56cfe0ec7da661
parent898a7d814c09620974216ee61ed855b85709e4c3 (diff)
downloadydb-e29ec2cd295da3a1574be2531d545f0d0accdeca.tar.gz
fix --go_out on windows
commit_hash:cf8227590444e769ad0460d4f8153c1ad2c3c6ed
-rw-r--r--build/conf/go.conf2
-rw-r--r--build/scripts/go_proto_wrapper.py1
2 files changed, 1 insertions, 2 deletions
diff --git a/build/conf/go.conf b/build/conf/go.conf
index 896f287bd2..2a7b00dd65 100644
--- a/build/conf/go.conf
+++ b/build/conf/go.conf
@@ -675,7 +675,7 @@ module _GO_BASE_UNIT: _BASE_UNIT {
}
default ? {
GO_PROTO_OUTS+=${hide;output;norel;nopath;noext;suf=.pb.go:File}
- GO_PROTO_OPTS+=--plugin=protoc-gen-go=${tool:_TOOL_PROTOC_GEN_GO} --go_out=$GO_PROTO_GEN_PLUGINS:${ARCADIA_BUILD_ROOT}/$PROTO_NAMESPACE
+ GO_PROTO_OPTS+=--plugin=protoc-gen-go=${tool:_TOOL_PROTOC_GEN_GO} --go_opt=${GO_PROTO_GEN_PLUGINS} --go_out=${ARCADIA_BUILD_ROOT}/$PROTO_NAMESPACE
}
}
diff --git a/build/scripts/go_proto_wrapper.py b/build/scripts/go_proto_wrapper.py
index 8f2a6130e0..c5d6c48bd1 100644
--- a/build/scripts/go_proto_wrapper.py
+++ b/build/scripts/go_proto_wrapper.py
@@ -51,7 +51,6 @@ def main(args):
if m:
out_dir_flag = m.group(1)
index = len(out_dir_flag)
- index = max(index, args[i].find(':', index) + 1)
out_dir = args[i][index:]
if out_dir_orig:
assert out_dir_orig == out_dir, 'Output directories do not match: [{}] and [{}]'.format(