Skip to content

Commit

Permalink
Propagate the target_arch for darwin-framework-tool to the framework …
Browse files Browse the repository at this point in the history
…build. (#24314)

We no longer use PLATFORM_PREFERRED_ARCH in chip_xcode_build_connector.sh; we
should be using ARCHS.  And we should always set --target_arch when calling
build_darwin_framework.py, so we handle someone setting a non-default one on the
command line when building darwin-framework-tool.
  • Loading branch information
bzbarsky-apple authored and pull[bot] committed Nov 15, 2023
1 parent 85931ae commit 1309400
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions examples/darwin-framework-tool/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,14 @@ action("build-darwin-framework") {
"Matter Framework",
"--log_path",
rebase_path("${root_build_dir}/darwin_framework_build.log", root_build_dir),
"--target_arch",
mac_target_arch,
]

if (sdk != "macosx") {
args += [
"--target_sdk",
sdk,
"--target_arch",
mac_target_arch,
]
}

Expand Down
2 changes: 1 addition & 1 deletion scripts/build/build_darwin_framework.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def build_darwin_framework(args):
args.project_path,
'-derivedDataPath',
abs_path,
"PLATFORM_PREFERRED_ARCH={}".format(args.target_arch),
"ARCHS={}".format(args.target_arch),
# For now disable unguarded-availability-new warnings because we
# internally use APIs that we are annotating as only available on
# new enough versions. Maybe we should change out deployment
Expand Down

0 comments on commit 1309400

Please sign in to comment.