Set SWIFT_SYSTEM_NAME for macro project in CMake
#896
Merged
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
jmschonfeld
requested review from
parkera,
etcwilde,
iCharlesHu and
itingliu
|
@swift-ci please test |
parkera
approved these changes
Sep 3, 2024
jmschonfeld
added a commit
to jmschonfeld/swift-foundation
that referenced
this pull request
Sep 3, 2024
jmschonfeld
added a commit
that referenced
this pull request
Sep 4, 2024
jmschonfeld
added a commit
to jmschonfeld/swift-foundation
that referenced
this pull request
Sep 4, 2024
jmschonfeld
added a commit
to jmschonfeld/swift-foundation
that referenced
this pull request
Sep 5, 2024
jmschonfeld
added a commit
that referenced
this pull request
Sep 5, 2024
cthielen
pushed a commit
to cthielen/swift-foundation
that referenced
this pull request
Nov 8, 2024
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
FoundationMacroswas moved into its own CMake project, we did not copy over theSWIFT_SYSTEM_NAMEsetting. This results in the rpath forlibFoundationMacros.sobeing$ORIGIN/../../../swift/:$ORIGIN/..instead of the correct value ($ORIGIN/../../../swift/linux:$ORIGIN/..for linux, for example). This fixes the macro build which allows#Predicateand#Expressionto work as expected.(note for context that this set value is used on line 90 of this file:
INSTALL_RPATH "$ORIGIN/../../../swift/${SWIFT_SYSTEM_NAME}:$ORIGIN/..")