This repository has been archived by the owner on Dec 20, 2023. It is now read-only.
Build changes for XCode 13 #690
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
Weave builds for iOS have been arguably somewhat incorrect. The Makefile-iOS used to generate a single Weave.framework for both iPhoneOS and for iPhoneSimulator. This became problematic in XCode 13, when the simulator architectures (x86_64, i386) were no longer supported in the iPhoneOS set of libraries, and builds have consequently started to fail. This patch passes different sysroots to the linker depending on whether the target is a iPhoneOS or an iPhoneSimulator. Bug: 190421934 Test: build succeeded on local machine, awaiting confirmation from maloo@ Change-Id: Ib3d2207d77388c00e8c1e397f6dd13fda1cb4d26
pidarped
approved these changes
Mar 24, 2022
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Weave builds for iOS have been arguably somewhat incorrect. The
Makefile-iOS used to generate a single Weave.framework for both
iPhoneOS and for iPhoneSimulator. This became problematic in XCode
13, when the simulator architectures (x86_64, i386) were no longer
supported in the iPhoneOS set of libraries, and builds have
consequently started to fail.
This patch passes different sysroots to the linker depending on
whether the target is a iPhoneOS or an iPhoneSimulator.
Bug: 190421934
Test: build succeeded on local machine, awaiting confirmation from maloo@
Change-Id: Ib3d2207d77388c00e8c1e397f6dd13fda1cb4d26