Skip to content

Migrate options from stdlib/CMakeLists.txt into dedicated file #40640

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Dec 23, 2021
Merged

Migrate options from stdlib/CMakeLists.txt into dedicated file #40640

merged 1 commit into from
Dec 23, 2021

Conversation

edymtt
Copy link
Contributor

@edymtt edymtt commented Dec 20, 2021

Focus on options that are not defined in StandaloneOverlay.cmake and
which defaults are not computed.

Addresses rdar://86723819

@edymtt
Copy link
Contributor Author

edymtt commented Dec 20, 2021

preset=stdlib_S_standalone_minimal_macho_x86_64,build,test
@swift-ci please test with toolchain and preset

@edymtt
Copy link
Contributor Author

edymtt commented Dec 20, 2021

@swift-ci please test Apple Silicon

@edymtt
Copy link
Contributor Author

edymtt commented Dec 20, 2021

@swift-ci please build toolchain

@edymtt
Copy link
Contributor Author

edymtt commented Dec 20, 2021

@swift-ci please smoke test

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 152172fc99b26475c07b985ccd447fe0b1a94105

@swift-ci
Copy link
Contributor

Linux Toolchain (Ubuntu 16.04)
Download Toolchain
Git Sha - 152172fc99b26475c07b985ccd447fe0b1a94105

Install command
tar zxf swift-PR-40640-757-ubuntu16.04.tar.gz
More info

@swift-ci
Copy link
Contributor

macOS Toolchain
Download Toolchain
Git Sha - 152172fc99b26475c07b985ccd447fe0b1a94105

Install command
tar -zxf swift-PR-40640-1252-osx.tar.gz --directory ~/

@edymtt
Copy link
Contributor Author

edymtt commented Dec 21, 2021

Please test with following pull request:
swiftlang/swift-driver#948

@swift-ci Please ASAN test

@edymtt
Migrate options from stdlib/CMakeLists.txt into dedicated file
10f3160 
Focus on options that are not defined in `StandaloneOverlay.cmake` and
which defaults are not computed.

Addresses rdar://86723819
@edymtt edymtt force-pushed the move-more-stdlib-options-to-separate-file branch from 152172f to 10f3160 Compare December 21, 2021 20:01
@edymtt
Copy link
Contributor Author

edymtt commented Dec 21, 2021

@swift-ci please test Apple Silicon

@edymtt
Copy link
Contributor Author

edymtt commented Dec 21, 2021

@swift-ci please build toolchain

@edymtt
Copy link
Contributor Author

edymtt commented Dec 21, 2021

@swift-ci please smoke test

@edymtt
Copy link
Contributor Author

edymtt commented Dec 21, 2021

preset=stdlib_S_standalone_minimal_macho_x86_64,build,test
@swift-ci please test with toolchain and preset

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 10f3160

@swift-ci
Copy link
Contributor

Linux Toolchain (Ubuntu 16.04)
Download Toolchain
Git Sha - 10f3160

Install command
tar zxf swift-PR-40640-758-ubuntu16.04.tar.gz
More info

@edymtt
Copy link
Contributor Author

edymtt commented Dec 21, 2021

@swift-ci Please ASAN test

edymtt added a commit to edymtt/swift that referenced this pull request Dec 21, 2021
@edymtt
[5.6 CMake] Move most Standard Library options in a separate file
49592c9 
This allows the file to be easily included where needed (e.g.
`StandaloneOverlay.cmake`) and reduce the likelihood of miscompilation
due to missing sensible defaults.

Focus on parameters only in stdlib/CMakeLists.txt whose defaults are not
computed.

This matches swiftlang#40610 + swiftlang#40640

Addresses rdar://86740965
@edymtt edymtt mentioned this pull request Dec 21, 2021
Merged
@edymtt
Copy link
Contributor Author

edymtt commented Dec 22, 2021

In ASAN test, Interpreter/SDK/weak_objc_interop.swift is a known transient failure.

@edymtt
Copy link
Contributor Author

edymtt commented Dec 22, 2021

@swift-ci please build toolchain macOS

@edymtt
Copy link
Contributor Author

edymtt commented Dec 22, 2021

-[SwiftDocCUtilitiesTests.ConvertActionTests testIgnoresAnalyzerHintsByDefault] seems to have crashed during execution

This does not happen in package bot, retrying for now.

@edymtt
Copy link
Contributor Author

edymtt commented Dec 22, 2021

@swift-ci please build toolchain macOS

@swift-ci
Copy link
Contributor

macOS Toolchain
Download Toolchain
Git Sha - 10f3160

Install command
tar -zxf swift-PR-40640-1258-osx.tar.gz --directory ~/

@edymtt edymtt merged commit 526e77c into swiftlang:main Dec 23, 2021
@edymtt edymtt deleted the move-more-stdlib-options-to-separate-file branch December 23, 2021 15:15
edymtt added a commit that referenced this pull request Jan 4, 2022
@edymtt
[5.6 CMake] Move most Standard Library options in a separate file (#4…
0bf73bb 
…0669)

This allows the file to be easily included where needed (e.g.
`StandaloneOverlay.cmake`) and reduce the likelihood of miscompilation
due to missing sensible defaults.

Focus on parameters only in stdlib/CMakeLists.txt whose defaults are not
computed.

This matches #40610 + #40640

Addresses rdar://86740965
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@compnerd compnerd compnerd approved these changes

@kubamracek kubamracek kubamracek approved these changes

@gottesmm gottesmm Awaiting requested review from gottesmm

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@edymtt @swift-ci @compnerd @kubamracek