[druntime: Pass CMAKE_C[XX]_COMPILER as CC/CXX for make-based integra…

…tion tests] To propagate the C[++] compilers at CMake configure-time to test-time.
ldc-developers · Sep 13, 2024 · 48b38b2 · 48b38b2
1 parent 7f31303
commit 48b38b2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.4.3)
-project(runtime C ASM)
+project(runtime C ASM CXX) # CXX for integration tests only
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR})
 

diff --git a/runtime/DRuntimeIntegrationTests.cmake b/runtime/DRuntimeIntegrationTests.cmake
@@ -78,6 +78,7 @@ foreach(name ${testnames})
         add_test(NAME ${fullname}
             COMMAND ${GNU_MAKE_BIN} -C ${PROJECT_SOURCE_DIR}/druntime/test/${name}
                 ROOT=${outdir} DMD=${LDMD_EXE_FULL} BUILD=${build} SHARED=1
+                CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER}
                 DRUNTIME=${druntime_path_build} DRUNTIMESO=${shared_druntime_path_build}
                 CFLAGS_BASE=${cflags_base} DFLAGS_BASE=${dflags_base} ${linkdl}
         )