Fix arch handling in chip_xcode_build_connector #23272
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
|
There's also |
|
PR #23272: Size comparison from e62498b to eb47e13 Increases (2 builds for cc13x2_26x2, esp32)
Decreases (13 builds for bl602, bl702, cc13x2_26x2, esp32, k32w, psoc6, telink)
Full report (38 builds for bl602, bl702, cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, psoc6, qpg, telink)
|
|
As a followup, the PLATFORM_DEFAULT_ARCH bit in |
auto-merge was automatically disabled
October 21, 2022 03:46
Head branch was pushed to by a user without write access
This makes Xcode builds for "My Mac" work on M1 Macs. Also set is_debug correctly and tweak some project / scheme settings.
ksperling-apple
force-pushed
the
darwin-xcode-m1-build
branch
from
9a0a05d to
050d4ab
Compare
|
PR #23272: Size comparison from 66c0270 to 050d4ab Increases (9 builds for cc13x2_26x2, k32w, psoc6, qpg, telink)
Decreases (6 builds for bl602, bl702, cc13x2_26x2, cyw30739, esp32)
Full report (38 builds for bl602, bl702, cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, psoc6, qpg, telink)
|
bzbarsky-apple
approved these changes
Oct 21, 2022
andy31415
approved these changes
Oct 21, 2022
|
PR #23272: Size comparison from 0854eb3 to d4e8786 Increases (3 builds for bl702, k32w, telink)
Decreases (1 build for telink)
Full report (10 builds for bl702, k32w, qpg, telink)
|
auto-merge was automatically disabled
October 24, 2022 22:16
Head branch was pushed to by a user without write access
|
PR #23272: Size comparison from 0d6c60f to e11dae6 Increases (5 builds for cc13x2_26x2, esp32, nrfconnect, psoc6)
Decreases (11 builds for bl602, bl702, cc13x2_26x2, k32w, psoc6, telink)
Full report (38 builds for bl602, bl702, cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, psoc6, qpg, telink)
|
adbridge
pushed a commit
to ARM-software/connectedhomeip
that referenced
this pull request
Nov 18, 2022
* Set target_cpu and mac_target_arch based on first arch in ARCHS. This makes Xcode builds for "My Mac" work on M1 Macs. Also set is_debug correctly and tweak some project / scheme settings. * restyle Co-authored-by: Andrei Litvin <[email protected]>
adbridge
pushed a commit
to ARM-software/connectedhomeip
that referenced
this pull request
Nov 18, 2022
* Set target_cpu and mac_target_arch based on first arch in ARCHS. This makes Xcode builds for "My Mac" work on M1 Macs. Also set is_debug correctly and tweak some project / scheme settings. * restyle Co-authored-by: Andrei Litvin <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Set target_cpu based on first arch in ARCHS so Xcode builds for Mac work on M1 Macs.
PLATFORM_PREFERRED_ARCHseems to be independent of the host architecture, so we end up with the wrongtarget_cpuandBUILDCONFIG.gndoesn't find the tool chain.An alternative fix might be to tweak the check in
BUILDCONFIG.gnthat selects the host tool chain (target_os == host_os && target_cpu == host_cpu) to ignore the CPU type when building on Mac for Mac. (It's not entirely clear to me whattarget_cpuis meant to be when building for botharm64andx86_64at the same time.)Also tweak project / scheme settings.