build: repair the Windows build#29483
Merged
compnerd merged 1 commit intoswiftlang:masterfrom Jan 28, 2020
Merged
Conversation
Member
Author
|
CC: @xiaobai |
Member
Author
|
@swift-ci please smoke test |
compnerd
force-pushed
the
duplication-is-good-for-you
branch
from
18469dd to
eadd215
Compare
Member
Author
|
@swift-ci please smoke test |
compnerd
force-pushed
the
duplication-is-good-for-you
branch
from
eadd215 to
f9c75fd
Compare
Member
Author
|
@swift-ci please smoke test |
compnerd
force-pushed
the
duplication-is-good-for-you
branch
from
f9c75fd to
c0f9053
Compare
Member
Author
|
@swift-ci please smoke test |
compnerd
force-pushed
the
duplication-is-good-for-you
branch
2 times, most recently
from
d76b142 to
07cf446
Compare
This should repair the Windows build after swiftlang#29451. The quoting behaviour was incorrect and was constructing an invalid compiler invocation. Solve the issue by using `target_include_directories` instead. However, since this needs the target, hoist the flag computation to the local sites. This replicates more logic because of the custom build trying to replicate the CMake build logic in CMake.
compnerd
force-pushed
the
duplication-is-good-for-you
branch
from
07cf446 to
a1c9719
Compare
Member
Author
|
@swift-ci please smoke test |
Member
Author
Member
Author
|
@swift-ci please test Windows platform |
Member
Author
|
@swift-ci please clean test Windows platform |
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
1 participant
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.
This should repair the Windows build after #29451. The quoting
behaviour was incorrect and was constructing an invalid compiler
invocation. Solve the issue by using
target_include_directoriesinstead. However, since this needs the target, hoist the flag
computation to the local sites. This replicates more logic because of
the custom build trying to replicate the CMake build logic in CMake.
Replace this paragraph with a description of your changes and rationale. Provide links to external references/discussions if appropriate.
Resolves SR-NNNN.