Runtimes: fix the install location for -static
#78722
Closed
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
compnerd
requested review from
etcwilde,
edymtt and
justice-adams-apple
as code owners
|
@swift-ci please test |
etcwilde
reviewed
Jan 17, 2025
compnerd
force-pushed
the
static_analysis
branch
from
1b10346 to
a9f7307
Compare
|
@swift-ci please smoke test |
When building the static SDK, we need to adjust the install locations so that the driver search will find the proper swiftmodule and library. The changes here adjust the install to use `swift_static` when building statically.
compnerd
force-pushed
the
static_analysis
branch
from
a9f7307 to
c4e94fe
Compare
|
@swift-ci please test |
|
@swift-ci please test macOS platform |
1 similar comment
|
@swift-ci please test macOS platform |
etcwilde
requested changes
Jan 23, 2025
| install(TARGETS swiftCore) | ||
| install(TARGETS swiftCore | ||
| ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}/$<$<NOT:$<PLATFORM_ID:Darwin>>:swift$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:_static>/${SwiftCore_PLATFORM_SUBDIR}/${SwiftCore_ARCH_SUBDIR}>" | ||
| LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/$<$<NOT:$<PLATFORM_ID:Darwin>>:swift$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:_static>/${SwiftCore_PLATFORM_SUBDIR}/${SwiftCore_ARCH_SUBDIR}>" |
There was a problem hiding this comment.
The <platform>/<arch> install directory is not correct for all build configurations either. The macOS builds, for instance, should be to /usr/lib/swift/libswiftCore.dylib, not /usr/lib/swift/macosx/arm64. Please add an option to disable the including the extra directories. Same for the swift module.
There was a problem hiding this comment.
The $<NOT:$<PLATFORM_ID:Darwin>> does that though. Is there a reason to generalise this into an option?
|
I'm going to close this in favour of #78860 |
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 the static SDK, we need to adjust the install locations so that the driver search will find the proper swiftmodule and library. The changes here adjust the install to use
swift_staticwhen building statically.