Prevent arm-runtime CMake arguments persisting over loops #587
Conversation
This file contains 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
The additional_cmake_args variable is used to override the defaults and disable testing so that it can be controlled by the higher-level CMake project. But the variable is currently set only when the tests should be disabled. If the tests do not need to be disabled, the value is not updated and the version from the previous iteration of the loop will be used, potentially incorrectly disabling the tests. To fix this, clear the value on evry loop if not needed.
smithp35
reviewed
Dec 2, 2024
arm-multilib/CMakeLists.txt
Outdated
| @@ -169,6 +169,7 @@ foreach(lib_idx RANGE ${lib_count_dec}) | |||
| set(read_ENABLE_COMPILER_RT_TESTS "OFF") | |||
| set(read_ENABLE_LIBCXX_TESTS "OFF") | |||
| else() | |||
| set(additional_cmake_args "") | |||
There was a problem hiding this comment.
Would this be better off above the if statement? That way if another conditional is added then it will automatically pick up a default "".
There was a problem hiding this comment.
Good point - I've changed it so every loop starts with an empty list, and the args get appended which makes more sense.
smithp35
approved these changes
Dec 2, 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.
The additional_cmake_args variable is used to override the defaults and disable testing so that it can be controlled by the higher-level CMake project. But the variable is currently set only when the tests should be disabled. If the tests do not need to be disabled, the value is not updated and the version from the previous iteration of the loop will be used, potentially incorrectly disabling the tests.
To fix this, clear the value on every loop if not needed.