[Backtracing] Add missing CxxStdlib dependency. #79057
Conversation
|
@swift-ci Please smoke test |
|
Gah. Somehow doing that has broken the static build of the backtracer by pulling in some shared objects. Continuing to look at the problem. |
|
Ah. It's CMake again; because I just added the |
al45tair
force-pushed
the
backtracing-cxxstdlib-dep
branch
from
e2b3307 to
e239ed2
Compare
|
@swift-ci Please smoke test |
|
@swift-ci Please smoke test macOS platform |
|
macOS is failing to clone now :-( But I think I need an extra dependency declaration, which might also break things again. Testing locally now. |
To do this we also need to fix AddSwiftStdlib because if you set the `INSTALL_WITH_SHARED` flag, the CMake scripts don't make a target with the `-static` suffix, but AddSwiftStdlib also assumes that it should dad `-static` to any module dependencies when building a static library.
al45tair
force-pushed
the
backtracing-cxxstdlib-dep
branch
from
e239ed2 to
884cf75
Compare
|
@swift-ci Please smoke test |
|
@swift-ci Please smoke test macOS platform |
| @@ -1317,38 +1317,46 @@ function(add_swift_target_library_single target name) | |||
| # Set compile and link flags for the non-static target. | |||
| # Do these LAST. | |||
| set(target_static) | |||
| if(SWIFTLIB_SINGLE_IS_STDLIB AND SWIFTLIB_SINGLE_STATIC AND NOT SWIFTLIB_SINGLE_INSTALL_WITH_SHARED) | |||
| if(SWIFTLIB_SINGLE_IS_STDLIB AND SWIFTLIB_SINGLE_STATIC) | |||
There was a problem hiding this comment.
Wait, when is SWIFTLIB_SINGLE_STATIC set, but we're not building static libraries?
There was a problem hiding this comment.
Oh, when building swiftCxx. Neat.
There was a problem hiding this comment.
Yeah, I think it's the only "normal" case where that happens. The compatibility libraries use these flags also, I think, but they probably aren't being used as a dependency (swiftCxxStdlib presumably wasn't either until now).
To do this we also need to fix AddSwiftStdlib because if you set the
INSTALL_WITH_SHAREDflag, the CMake scripts don't make a target with the-staticsuffix, but AddSwiftStdlib also assumes that it should dad-staticto any module dependencies when building a static library.