Skip to content

Prevent arm-runtime CMake arguments persisting over loops #587

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Dec 2, 2024
Merged

Prevent arm-runtime CMake arguments persisting over loops #587

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dafbb12
Prevent arm-runtime CMake arguments persisting over loops
dcandler Dec 2, 2024
f3982e7
fixup! Prevent arm-runtime CMake arguments persisting over loops
dcandler Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion arm-multilib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ math(EXPR lib_count_dec "${lib_count} - 1")
foreach(lib_idx RANGE ${lib_count_dec})
string(JSON lib_def GET ${multilib_defs} ${lib_idx})
string(JSON variant GET ${lib_def} "variant")
set(additional_cmake_args "")

if(variant IN_LIST ENABLE_VARIANTS OR ENABLE_VARIANTS STREQUAL "all")
string(JSON variant_multilib_flags GET ${lib_def} "flags")
Expand Down Expand Up @@ -164,7 +165,7 @@ foreach(lib_idx RANGE ${lib_count_dec})
# FVP testing should default to off, so override any
# settings from the JSON.
if(test_executor STREQUAL "fvp" AND NOT ${ENABLE_FVP_TESTING})
set(additional_cmake_args "-DENABLE_LIBC_TESTS=OFF" "-DENABLE_COMPILER_RT_TESTS=OFF" "-DENABLE_LIBCXX_TESTS=OFF")
list(APPEND additional_cmake_args "-DENABLE_LIBC_TESTS=OFF" "-DENABLE_COMPILER_RT_TESTS=OFF" "-DENABLE_LIBCXX_TESTS=OFF")
set(read_ENABLE_LIBC_TESTS "OFF")
set(read_ENABLE_COMPILER_RT_TESTS "OFF")
set(read_ENABLE_LIBCXX_TESTS "OFF")
Expand Down
Loading