[Build] Update SWIFT_TARGET_LIBRARY_NAME for swiftRuntime in new build. #78977
Conversation
al45tair
requested review from
etcwilde,
compnerd,
edymtt and
justice-adams-apple
as code owners
|
@swift-ci Please smoke test |
|
See #78516, which changed the name so that we can use |
| PRIVATE | ||
| -DSWIFT_RUNTIME | ||
| -DSWIFT_TARGET_LIBRARY_NAME=swiftRuntime | ||
| -DSWIFT_TARGET_LIBRARY_NAME=swiftRuntimeCore |
There was a problem hiding this comment.
I believe this is the only part that actually needs changing here so that the compatibility header picks things up correctly. This is an object library that only contains C/C++, so there shouldn't be any conflict with parts from the old build. Given that the Runtime module depends on the overlay, it will have to be a separate "supplemental" library anyway.
We need to change `SWIFT_TARGET_LIBRARY_NAME` for the `swiftRuntime` target in the new build because of changes made to the old build system.
al45tair
force-pushed
the
rename-swift-runtime-target
branch
from
c8f882d to
72d3c22
Compare
al45tair
changed the title
|
@swift-ci Please smoke test |
| @@ -86,7 +86,7 @@ endif() | |||
| target_compile_definitions(swiftRuntime | |||
| PRIVATE | |||
| -DSWIFT_RUNTIME | |||
| -DSWIFT_TARGET_LIBRARY_NAME=swiftRuntime | |||
| -DSWIFT_TARGET_LIBRARY_NAME=swiftRuntimeCore | |||
There was a problem hiding this comment.
This is incorrect, this should be swiftCore. The way that this macro is used is with the CPP macro programming in Visibility.h, and the only valid options are swiftCore, swift_Concurrency, swiftDistributed, swift_Differentiation`. The value is used to select if the symbol is in the current module's ABI or not. See https://github.com/swiftlang/swift/blob/main/stdlib/public/SwiftShims/swift/shims/Visibility.h#L190-L214
There was a problem hiding this comment.
That's not the only place it gets used, and it was being used with swiftRuntime in the past (which is not part of the list you're referring to). The macro we're tripping up over isn't actually one of the ones from Visibility.h either; it's CompatibilityOverride.h that's the problem in this case, and in particular COMPATIBILITY_OVERRIDE_INCLUDE_PATH_swiftRuntime[Core] that was the issue.
All I'm trying to fix here is the build breakage, and only by updating the spelling that I've changed, rather than doing something entirely new.
We need to change
SWIFT_TARGET_LIBRARY_NAMEfor theswiftRuntimetarget in the new build because of changes made to the old build system.