remove redundant extra_cmake_options uses

ARM-software · Jun 21, 2023 · d527131 · d527131
1 parent 3464c05
commit d527131
Showing 1 changed file with 4 additions and 12 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -566,12 +566,6 @@ Hard-float library with target triple \"${target_triple}\" must end \"-eabihf\""
     string(REPLACE " " ":" qemu_params_colon "${qemu_params}")
     set(test_executor
         "${CMAKE_CURRENT_SOURCE_DIR}/test-support/lit-exec-qemu.py --qemu-command ${qemu_command} --qemu-params=${qemu_params_colon}")
-    list(APPEND extra_cmake_options
-        -DLIBC_LINKER_SCRIPT=picolibcpp.ld
-        -DLIBCXX_EXECUTOR=${test_executor}
-        -DLIBCXXABI_EXECUTOR=${test_executor}
-        -DLIBUNWIND_EXECUTOR=${test_executor}
-    )
 
     set(compiler_rt_test_flags "--config ${LLVM_BINARY_DIR}/bin/${variant}_semihost.cfg -T picolibcpp.ld")
     if(variant STREQUAL "armv6m_soft_nofp")
@@ -660,12 +654,6 @@ function(
     get_qemu_command("${target_triple}")
     set(test_executor
         "${CMAKE_CURRENT_SOURCE_DIR}/test-support/lit-exec-qemu.py --qemu-command ${qemu_command} --qemu-params=${qemu_params_colon}")
-    list(APPEND extra_cmake_options
-        -DLIBC_LINKER_SCRIPT=picolibcpp.ld
-        -DLIBCXX_EXECUTOR=${test_executor}
-        -DLIBCXXABI_EXECUTOR=${test_executor}
-        -DLIBUNWIND_EXECUTOR=${test_executor}
-        PARENT_SCOPE)
 
     ExternalProject_Add(
         libcxx_libcxxabi_libunwind_${variant}
@@ -690,23 +678,27 @@ function(
         # Let CMake know we're cross-compiling
         -DCMAKE_SYSTEM_NAME=Generic
         -DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY
+        -DLIBC_LINKER_SCRIPT=picolibcpp.ld
         -DLIBCXXABI_BAREMETAL=ON
         -DLIBCXXABI_ENABLE_ASSERTIONS=OFF
         -DLIBCXXABI_ENABLE_SHARED=OFF
         -DLIBCXXABI_ENABLE_STATIC=ON
         -DLIBCXXABI_LIBCXX_INCLUDES="${LLVM_BINARY_DIR}/${directory}/include/c++/v1"
         -DLIBCXXABI_USE_COMPILER_RT=ON
         -DLIBCXXABI_USE_LLVM_UNWINDER=ON
+        -DLIBCXXABI_EXECUTOR=${test_executor}
         -DLIBCXX_CXX_ABI=libcxxabi
         -DLIBCXX_ENABLE_FILESYSTEM=OFF
         -DLIBCXX_ENABLE_SHARED=OFF
         -DLIBCXX_ENABLE_STATIC=ON
         -DLIBCXX_INCLUDE_BENCHMARKS=OFF
+        -DLIBCXX_EXECUTOR=${test_executor}
         -DLIBUNWIND_ENABLE_SHARED=OFF
         -DLIBUNWIND_ENABLE_STATIC=ON
         -DLIBUNWIND_IS_BAREMETAL=ON
         -DLIBUNWIND_REMEMBER_HEAP_ALLOC=ON
         -DLIBUNWIND_USE_COMPILER_RT=ON
+        -DLIBUNWIND_EXECUTOR=${test_executor}
         -DLLVM_LIT_ARGS=${LLVM_LIT_ARGS}
         -DLLVM_ENABLE_RUNTIMES=libcxxabi,libcxx,libunwind
         -DRUNTIME_TEST_ARCH_FLAGS=${flags}