Skip to content

[🍒 Swift 6.0.x] Use toolchain clang on macOS #77413

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

Conversation

etcwilde
Copy link
Contributor

@etcwilde etcwilde commented Nov 6, 2024

Cherry-Picking PR: #74033

Don't use the just-built clang on macOS. macOS does this more "right" than the Linux build. Linux will sometimes use the just-built Swift-driver with the just-built clang, but sometimes would use the system clang instead. macOS uses the toolchain Swift-driver with the toolchain clang. This is correct, but it means that if we force the other clang, we'll get mismatched sanitizer runtimes so the ASAN bot will fail.

rdar://139245838

Don't use the just-built clang on macOS. macOS does this more "right"
than the Linux build. Linux will sometimes use the just-built
Swift-driver with the just-built clang, but sometimes would use the
system clang instead. macOS uses the toolchain Swift-driver with the
toolchain clang. This is correct, but it means that if we force the
other clang, we'll get mismatched sanitizer runtimes so the ASAN bot
will fail.

(cherry picked from commit f446c25)
@etcwilde etcwilde requested review from beccadax and artemcm November 6, 2024 04:26
@etcwilde etcwilde requested a review from a team as a code owner November 6, 2024 04:26
@etcwilde
Copy link
Contributor Author

etcwilde commented Nov 6, 2024

@swift-ci please test

@etcwilde
Copy link
Contributor Author

etcwilde commented Nov 6, 2024

preset=asan
@swift-ci please test with preset macOS platform

@etcwilde etcwilde force-pushed the ewilde/6.0-use-toolchain-clang-on-macos branch from 0225ad5 to 1e76df7 Compare November 6, 2024 15:18
@etcwilde
Copy link
Contributor Author

etcwilde commented Nov 6, 2024

preset=asan
@swift-ci please test with preset macOS platform

@etcwilde
Copy link
Contributor Author

etcwilde commented Nov 6, 2024

@swift-ci please test

@etcwilde etcwilde merged commit f642519 into swiftlang:release/6.0 Nov 6, 2024
6 checks passed
@etcwilde etcwilde deleted the ewilde/6.0-use-toolchain-clang-on-macos branch November 6, 2024 23:33
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.

2 participants