commit 380ddd685b3cd5c88baccb1ae04ccd0a6690b3e0
author Vivien Nicolas <vnicolas@apple.com> Wed Nov 06 13:28:43 2024 +0100
committer GitHub <noreply@github.com> Wed Nov 06 12:28:43 2024 +0000
tree a9f530b8b9f6dbe04cb8931a18136af2ef47a4db
parent 4fce9b9e24452f99b634da74265ffe174c9cab83

[darwin-framework-tool] Some macosx variants does not use the right output dir (#36384)

examples/darwin-framework-tool/BUILD.gn

diff --git a/examples/darwin-framework-tool/BUILD.gn b/examples/darwin-framework-tool/BUILD.gn
index f5333c9..fbe1c4d 100644
--- a/examples/darwin-framework-tool/BUILD.gn
+++ b/examples/darwin-framework-tool/BUILD.gn
@@ -53,7 +53,9 @@
 if (getenv("SDKROOT") != "") {
   sdk = getenv("SDKROOT")
   sdk_root_parts = string_split(getenv("SDKROOT"), ".")
-  sdk_build_dir_suffix = "-${sdk_root_parts[0]}"
+  if (sdk_root_parts[0] != "macosx") {
+    sdk_build_dir_suffix = "-${sdk_root_parts[0]}"
+  }
 }
 output_sdk_type = "Debug${sdk_build_dir_suffix}"
 
@@ -134,7 +136,7 @@
     "${root_out_dir}/macos_framework_output/Build",
   ]
 
-  if (sdk == "macosx") {
+  if (sdk == "macosx" || sdk_root_parts[0] == "macosx") {
     outputs += [ "${root_out_dir}/macos_framework_output/Build/Intermediates.noindex/Matter.build/${output_sdk_type}/Matter.build/out/lib/libCHIP.a" ]
   }
 }
@@ -285,11 +287,12 @@
     "Foundation.framework",
     "CoreBluetooth.framework",
     "Network.framework",
+    "IOKit.framework",
   ]
 
   # Other SDKs are linked statically to Matter.framework but the macosx SDK is linked dynamically but needs some symbols that are
   # not exposed by the dylib.
-  if (sdk == "macosx") {
+  if (sdk == "macosx" || sdk_root_parts[0] == "macosx") {
     libs = [ "${root_out_dir}/macos_framework_output/Build/Intermediates.noindex/Matter.build/${output_sdk_type}/Matter.build/out/lib/libCHIP.a" ]
   }