aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorspreis <spreis@yandex-team.com>2023-10-25 18:09:17 +0300
committerspreis <spreis@yandex-team.com>2023-10-25 18:57:36 +0300
commit40cc05e8d8665e5ee698aa0f29080e8945ff074b (patch)
tree3290c822e0ae01f6fda8ade38da6f575dcc53250
parent3be0cfc9bbe2e215487f7f19a406560bd2088b25 (diff)
downloadydb-40cc05e8d8665e5ee698aa0f29080e8945ff074b.tar.gz
Support prebuilt protoc-gen-go for darwin-arm64
-rw-r--r--build/ymake.core.conf10
1 files changed, 6 insertions, 4 deletions
diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index c031c56db5..e25997550f 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -84,11 +84,13 @@ when ($DISABLE_SEPARATE_AUX_CPP != "yes") {
SEPARATE_AUX_CPP=yes
}
-when ($HOST_ARCH_X86_64 == "yes") {
- when ($HOST_OS_DARWIN == "yes" || $HOST_OS_LINUX == "yes" || $HOST_OS_WINDOWS == "yes") {
- VALID_HOST_PLATFORM_FOR_COMMON_PREBUILT_TOOLS=yes
+when ($USE_PREBUILT_TOOLS == "yes") {
+ when ($HOST_ARCH_X86_64 == "yes" && $ARCH_X86_64 == "yes" && ($HOST_OS_LINUX == "yes" || $HOST_OS_WINDOWS == "yes")) {
+ _TOOL_PROTOC_GEN_GO=${_PREBUILT_TOOLS_ROOT}/vendor/github.com/golang/protobuf/protoc-gen-go
+ }
- when ($USE_PREBUILT_TOOLS == "yes" && $ARCH_X86_64 == "yes") {
+ when ($HOST_OS_DARWIN == "yes" && ($HOST_ARCH_ARM64 == "yes" || $HOST_ARCH_X86_64 == "yes")) {
+ when ($ARCH_ARM64 == "yes" || $ARCH_X86_64 == "yes") {
_TOOL_PROTOC_GEN_GO=${_PREBUILT_TOOLS_ROOT}/vendor/github.com/golang/protobuf/protoc-gen-go
}
}