build: repair the sub-build for libdispatch on Windows i686 #39101
Conversation
This file contains hidden or 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
When building on Windows i686 with a toolchain build for Windows x64, we would try to build libdispatch for i686 as x86_64. This obviously would be incorrect. Explicitly pass the target triple for the sub-builds. We can do this unconditionally since we always use `clang-cl` builds. This allows us to build the SDK only components for Windows i686 from a 64bit build.
|
@swift-ci please test |
|
Excellent suggestion from @gottesmm: this is ripe for conversion to a toolchain file. Doing so should really simplify the amount of logic here. That however is a target for another day. This currently should hopefully allow reviving the 32-bit builds of the Windows SDK. |
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.
When building on Windows i686 with a toolchain build for Windows x64, we
would try to build libdispatch for i686 as x86_64. This obviously would
be incorrect. Explicitly pass the target triple for the sub-builds. We
can do this unconditionally since we always use
clang-clbuilds. Thisallows us to build the SDK only components for Windows i686 from a 64bit
build.
Replace this paragraph with a description of your changes and rationale. Provide links to external references/discussions if appropriate.
Resolves SR-NNNN.