🍒[Swift 6.0] Allow overriding clang++ with an environment variable #1638
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Check that the clang override environment variables actually do something. Note that clang++ is only used to link on non-Darwin platforms when the interop mode is swift-5.9.
'+' isn't allowed in environment variable names so it's impossible to set the Clang++ executable at the moment. Replace `+` with `X` so that we can set `SWIFT_DRIVER_CLANGXX_EXEC` to set the clang++ executable.
|
@swift-ci please test |
nkcsgexi
approved these changes
Nov 4, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Cherry-picking: #1605
Explanation: Replaces
+withXin the toolchain while doing tool lookup from an environment variable because+is not allowed in valid environment variable names. This prevents us from telling the driver where to look for the clang++ binary.Risk: Low. Only affects projects that set the
SWIFT_DRIVER_CLANGXX_EXECenvironment variable. Since that doesn't do anything today, that would be a silly thing to do. Otherwise, projects cannot currently setSWIFT_DRIVER_CLANG++_EXECbecause that's an invalid environment variable name.Testing: Added test to verify that the substitution is made correctly.
Fixes: rdar://128007218