[cmake] Recover original CMAKE_C/CXX_COMPILER after changing them. #22428
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
Seems that the change in the two variables was spilling into the other target of the file, but returning it back to the original values seems to avoid that issue. This should unbreak the Android CI build. In it, the Linux static library was changing to the host compiler, and that compiler was being used for the Android runtime library, which would have never compile that way (since the host compiler in CI is an old-ish Clang without the necessary argument).
|
@drodriguez absolutely disgusting! Yes, but, unfortunately, until we split the builds, this is the best we can do :-(. |
|
CC: @gottesmm @Rostepher |
|
@swift-ci please test |
|
This probably is a good thing to test on Windows as well, but, I guess that we can do that post-commit as well. At the very least, the nightly build will test this. |
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.
Seems that the change in the two variables was spilling into the other
target of the file, but returning it back to the original values seems
to avoid that issue.
This should unbreak the Android CI build. In it, the Linux static
library was changing to the host compiler, and that compiler was being
used for the Android runtime library, which would have never compile
that way (since the host compiler in CI is an old-ish Clang without the
necessary argument).
/cc @compnerd: It is way more of a hack than what you were proposing, but it works.