[CMake] Only build StdlibUnittest when SDK overlay is built#3043
Merged
swift-ci merged 1 commit intoswiftlang:masterfrom Jun 19, 2016
Merged
[CMake] Only build StdlibUnittest when SDK overlay is built#3043swift-ci merged 1 commit intoswiftlang:masterfrom
swift-ci merged 1 commit intoswiftlang:masterfrom
Conversation
On Linux it used to be possible to build only the stdlib, without the SDK overlays, like so: ``` utils/build-script -- --build-swift-stdlib --build-swift-sdk-overlay=0 ``` However this invocation now results in the following error: ``` + /usr/bin/cmake --build /home/modocache/GitHub/apple/build/Ninja-ReleaseAssert/swift-linux-x86_64 -- -j8 all swift-stdlib-linux-x86_64 ninja: error: '/home/modocache/GitHub/apple/swift/stdlib/private/SwiftPrivatePthreadExtras/swiftGlibc-linux-x86_64', needed by 'stdlib/private/SwiftPrivatePthreadExtras/linux/x86_64/SwiftPrivatePthreadExtras.o', missing and no known rule to make it utils/build-script: fatal error: command terminated with a non-zero exit status 1, aborting ``` The problem is that SwiftPrivatePthreadExtras is always built, regardless of whether the SDK overlay is built. I believe there's an explicit check against this for Darwin platforms to prevent the same error. The solution, implemented here, is to add the same check for Linux.
modocache
referenced
this pull request
Jun 16, 2016
Contributor
Author
|
@swift-ci please test |
This was referenced Jun 16, 2016
Contributor
|
LGTM! Re-testing on top of other CMake changes that landed recently: @swift-ci Please test and merge |
Contributor
Author
|
Thanks! :) |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
What's in this pull request?
On Linux it used to be possible to build only the stdlib, without the SDK overlays, like so:
However this invocation, as of #2057, now results in the following error:
The problem is that SwiftPrivatePthreadExtras is always built, regardless of whether the SDK overlay is built. I believe there's an explicit check against this for Darwin platforms to prevent the same error.
The solution, implemented here, is to add the same check for Linux.
Resolved bug number: None
Before merging this pull request to apple/swift repository:
Triggering Swift CI
The swift-ci is triggered by writing a comment on this PR addressed to the GitHub user @swift-ci. Different tests will run depending on the specific comment that you use. The currently available comments are:
Smoke Testing
Validation Testing
Lint Testing
Note: Only members of the Apple organization can trigger swift-ci.