[CMake] Fix compiler-rt builtins configuration bug on darwin #173811
+9
−9
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.
This PR fixes a configuration bug (#173810) that was particularly painful to track down because it happens in the compiler-rt builtins configuration, which is performed on the fly in the middle of the build step.
The symptoms
On recent macos systems, the old i386 arch is disabled even if the system SDK lists it as supported. However, while all the other subprojects correctly diagnose the situation and adequately remove i386 from the list of architectures to compile for, the builtins behave differently and fails to build.
The root cause
When configuring the builtins the variable
TEST_COMPILE_ONLYis ON (see. https://github.com/llvm/llvm-project/blob/main/compiler-rt/cmake/builtin-config-ix.cmake#L219), and because the cmake code performing this logic is located in anif(NOT TEST_COMPILE_ONLY)block, the code is not executed in this specific context.The proposed solution
Move this piece of logic outside of the conditional block so that all code paths are treated equally.