Skip to content

[6.0 🍒][CMake] Establish a dependency from standard library variants onto 'libSwiftScan' #77704

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed

Conversation

artemcm
Copy link
Contributor

@artemcm artemcm commented Nov 19, 2024

Cherry-pick of #77606 and #77621 and #73383

@artemcm artemcm requested a review from a team as a code owner November 19, 2024 18:22
@artemcm
Copy link
Contributor Author

artemcm commented Nov 19, 2024

@swift-ci test

1 similar comment
@artemcm
Copy link
Contributor Author

artemcm commented Nov 19, 2024

@swift-ci test

@artemcm artemcm force-pushed the 60_MoveLibSwiftScanOutOfTools branch 2 times, most recently from 10a32d5 to 9d328e0 Compare November 19, 2024 20:15
@artemcm
Copy link
Contributor Author

artemcm commented Nov 19, 2024

@swift-ci test

@artemcm
Copy link
Contributor Author

artemcm commented Nov 21, 2024

@swift-ci test macOS platform

1 similar comment
@DougGregor
Copy link
Member

@swift-ci test macOS platform

artemcm and others added 4 commits December 2, 2024 12:00
'tools' should be reserved for executable tools.
Locally I build debug builds without the standard library,
using a copy of the stdlib in my release build. This hit
a CMake error here since the `HostCompatibilityLibs` target
isn't defined. Update to only access it when doing a bootstrapping
build.
This was already the intention before, but it didn't work because cmake's `option` only works for boolean variables.
Using `set` instead of `option` fixes that.

This change also enables SwiftCompilerSources in lldb on Windows.
swiftlang#73322
@artemcm artemcm force-pushed the 60_MoveLibSwiftScanOutOfTools branch from 9d328e0 to 0735d49 Compare December 2, 2024 20:14
@artemcm
Copy link
Contributor Author

artemcm commented Dec 2, 2024

Testing adding db50797 to this change.

@artemcm
Copy link
Contributor Author

artemcm commented Dec 2, 2024

@swift-ci test

@@ -362,7 +361,7 @@ How to build the swift compiler modules. Possible values are
`SWIFT_NATIVE_SWIFT_TOOLS_PATH` (non-Darwin only)
CROSSCOMPILE-WITH-HOSTLIBS: build with a bootstrapping-with-hostlibs compiled
compiler, provided in `SWIFT_NATIVE_SWIFT_TOOLS_PATH`
]=] OFF)
]=])
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not think we should be removing OFF here. I'm actually trying to get it working again in #77815 :)

@DougGregor
Copy link
Member

@artemcm Please add the cherry-pick template here. The build changes here feel a bit invasive, and it's not clear how to weigh the benefit of taking this in the 6.0 branch vs. the risks associated with the build changes.

@artemcm artemcm closed this Dec 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants