Stricter platform check for prebuilt protoc-gen-go

siarheivesialou · Dec 14, 2023 · d8cb8df · d8cb8df
1 parent 76b2119
commit d8cb8df
Showing 1 changed file with 14 additions and 11 deletions.
diff --git a/build/ymake.core.conf b/build/ymake.core.conf
@@ -86,23 +86,26 @@ when ($DISABLE_SEPARATE_AUX_CPP != "yes") {
     SEPARATE_AUX_CPP=yes
 }
 
+_HOST_SUPPORTS_PREBUILT_PROTOC_GEN_GO=no
+_TARGET_SUPPORTS_PREBUILT_PROTOC_GEN_GO=no
 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 ($HOST_ARCH_X86_64 == "yes" && ($HOST_OS_LINUX == "yes" || $HOST_OS_WINDOWS == "yes" || $HOST_OS_DARWIN == "yes")) {
+        _HOST_SUPPORTS_PREBUILT_PROTOC_GEN_GO=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
-        }
+    when ($HOST_ARCH_ARM64 == "yes" && $HOST_OS_DARWIN == "yes") {
+        _HOST_SUPPORTS_PREBUILT_PROTOC_GEN_GO=yes
     }
 
-    when ($HOST_ARCH_X86_64 == "yes" && $HOST_OS_LINUX == "yes" && $OS_DARWIN == "yes") {
-        when ($ARCH_ARM64 == "yes" || $ARCH_X86_64 == "yes") {
-            _TOOL_PROTOC_GEN_GO=${_PREBUILT_TOOLS_ROOT}/vendor/github.com/golang/protobuf/protoc-gen-go
-        }
+    when ($ARCH_X86_64 == "yes" && ($OS_LINUX == "yes" || $OS_WINDOWS == "yes" || $OS_DARWIN == "yes")) {
+        _TARGET_SUPPORTS_PREBUILT_PROTOC_GEN_GO=yes
+    }
+    when ($ARCH_ARM64 == "yes" && $OS_DARWIN == "yes") {
+        _TARGET_SUPPORTS_PREBUILT_PROTOC_GEN_GO=yes
     }
 
+    when ($_HOST_SUPPORTS_PREBUILT_PROTOC_GEN_GO == "yes" && $_TARGET_SUPPORTS_PREBUILT_PROTOC_GEN_GO == "yes") {
+        _TOOL_PROTOC_GEN_GO=${_PREBUILT_TOOLS_ROOT}/vendor/github.com/golang/protobuf/protoc-gen-go
+    }
 }
 
 ### @usage: SELECT_CLANG_SA_CONFIG(static_analyzer.yaml)