Configure ldc2.conf compiler-specific settings in root CMakeLists.txt

Some settings like the default wasm switches or the compiler-rt
lib-dir don't have anything to do with the runtime and, on top of
that, some are conditioned by build settings that only affect the
compiler.

Moving them out of the runtime directory improves the support for
cross-compiling because, in the scenario, some variables may be
unset in the runtime directory as there is no longer a higher-level
project to set them.

Signed-off-by: Andrei Horodniceanu <a.horodniceanu@proton.me>

Author: the-horo

CMakeLists.txt

@@ -122,6 +122,7 @@ set(DMD_VERSION ${DMDFE_MAJOR_VERSION}.${DMDFE_MINOR_VERSION}.${DMDFE_PATCH_VERS
 set(D_VERSION ${DMDFE_MAJOR_VERSION} CACHE STRING "D language version")
 set(PROGRAM_PREFIX "" CACHE STRING "Prepended to ldc/ldmd binary names")
 set(PROGRAM_SUFFIX "" CACHE STRING "Appended to ldc/ldmd binary names")
+set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include/d CACHE PATH "Path to install D modules to")
 
 # Note: LIB_SUFFIX should perhaps be renamed to LDC_LIBDIR_SUFFIX.
 set(LIB_SUFFIX "" CACHE STRING "Appended to the library installation directory. Set to '64' to install libraries into ${PREFIX}/lib64.")
@@ -902,10 +903,6 @@ if(NOT DEFINED COMPILER_RT_LIBDIR_CONFIG)
         set(COMPILER_RT_LIBDIR_CONFIG "${COMPILER_RT_LIBDIR}")
     endif()
 endif()
-if(DEFINED COMPILER_RT_LIBDIR_CONFIG)
-    message(STATUS "Adding ${COMPILER_RT_LIBDIR_CONFIG} to lib-dirs in configuration file")
-    makeConfSection(NAME "35-ldc-compiler-rt" SECTION "default" LIB_DIRS "${COMPILER_RT_LIBDIR}")
-endif()
 
 #
 # Auxiliary build and test utils.
@@ -953,6 +950,59 @@ endif()
 #
 add_subdirectory(tools)
 
+#
+# Compiler ldc2.conf configuration
+#
+
+set(switches)
+
+# LLVM 16: Disable function specializations by default.
+# They cause miscompiles of e.g. the frontend for some targets (macOS x86_64 and Windows x64).
+if(LDC_LLVM_VER GREATER 1599 AND LDC_LLVM_VER LESS 1700)
+    list(APPEND switches "-func-specialization-size-threshold=1000000000")
+endif()
+
+if(DEFINED COMPILER_RT_LIBDIR_CONFIG)
+    message(STATUS "Adding ${COMPILER_RT_LIBDIR_CONFIG} to lib-dirs in configuration file")
+endif()
+
+list(APPEND switches "-defaultlib=phobos2-ldc,druntime-ldc")
+
+makeConfSection(NAME "35-ldc-compiler" SECTION "default"
+    BUILD
+    SWITCHES ${switches}
+    # -defaultlib is configure in runtime/CMakeLists.txt
+    POST_SWITCHES
+	"-I${PROJECT_SOURCE_DIR}/runtime/druntime/src"
+	"-I${PROJECT_BINARY_DIR}/import"
+	"-I${PROJECT_SOURCE_DIR}/runtime/phobos"
+	"-I${PROJECT_SOURCE_DIR}/runtime/jit-rt/d"
+    LIB_DIRS ${COMPILER_RT_LIBDIR_CONFIG}
+
+    INSTALL
+    SWITCHES ${switches}
+    POST_SWITCHES "-I${INCLUDE_INSTALL_DIR}"
+    LIB_DIRS ${COMPILER_RT_LIBDIR_CONFIG}
+)
+
+set(wasm_switches)
+list(APPEND wasm_switches -defaultlib=)
+# Default wasm stack is only 64kb, this is rather small, let's bump it to 1mb
+list(APPEND wasm_switches -L-z -Lstack-size=1048576)
+# Protect from stack overflow overwriting global memory
+list(APPEND wasm_switches -L--stack-first)
+if(LDC_WITH_LLD)
+    list(APPEND wasm_switches -link-internally)
+endif()
+# LLD 8+ requires (new) `--export-dynamic` for WebAssembly (https://github.com/ldc-developers/ldc/issues/3023).
+list(APPEND wasm_switches -L--export-dynamic)
+
+makeConfSection(NAME "40-ldc-wasm"
+    SECTION "^wasm(32|64)-"
+    SWITCHES ${wasm_switches}
+    LIB_DIRS OVERRIDE
+)
+
 #
 # Test and runtime targets. Note that enable_testing() is order-sensitive!
 #

cmake/Modules/LdcConfig.cmake

@@ -229,7 +229,5 @@ else()
     set(DONT_INSTALL_CONF FALSE)
 endif()
 
-set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include/d CACHE PATH "Path to install D modules to")
-
 defineIfUnset(LDC_BUILD_CONF "${CMAKE_BINARY_DIR}/etc/ldc2.conf")
 defineIfUnset(LDC_INSTALL_CONF "${CMAKE_BINARY_DIR}/etc/ldc2_install.conf")

runtime/CMakeLists.txt

@@ -16,9 +16,6 @@ if(NOT LDC_EXE)
     if(NOT DEFINED DMDFE_MINOR_VERSION OR NOT DEFINED DMDFE_PATCH_VERSION)
         message(FATAL_ERROR "Please define the CMake variables DMDFE_MINOR_VERSION and DMDFE_PATCH_VERSION.")
     endif()
-    if(NOT DEFINED LDC_WITH_LLD)
-        message(FATAL_ERROR "Please define the CMake variable LDC_WITH_LLD.")
-    endif()
 endif()
 
 #
@@ -273,26 +270,6 @@ elseif(${BUILD_SHARED_LIBS} STREQUAL "OFF")
     set(switches "-link-defaultlib-shared=false")
 endif()
 
-# LLVM 16: Disable function specializations by default.
-# They cause miscompiles of e.g. the frontend for some targets (macOS x86_64 and Windows x64).
-if(LDC_LLVM_VER GREATER 1599 AND LDC_LLVM_VER LESS 1700)
-    list(APPEND switches "-func-specialization-size-threshold=1000000000")
-endif()
-
-list(APPEND switches "-defaultlib=phobos2-ldc,druntime-ldc")
-
-# Directory filled with auto-generated import files
-set(LDC_GCCBUILTINS_IMPORT_DIR "${CMAKE_BINARY_DIR}/import")
-set(build_post_switches
-    "-I${RUNTIME_DIR}/src"
-    "-I${LDC_GCCBUILTINS_IMPORT_DIR}"
-    "-I${JITRT_DIR}/d"
-)
-if(PHOBOS2_DIR)
-    list(APPEND build_post_switches "-I${PHOBOS2_DIR}")
-endif()
-set(install_post_switches "-I${INCLUDE_INSTALL_DIR}")
-
 set(build_libdir "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}")
 set(install_libdir "${CMAKE_INSTALL_LIBDIR}")
 
@@ -307,34 +284,15 @@ makeConfSection(NAME "30-ldc-runtime-lib${LIB_SUFFIX}"
 
     BUILD
     SWITCHES ${switches}
-    POST_SWITCHES OVERRIDE ${build_post_switches}
     LIB_DIRS OVERRIDE ${build_libdir}
     RPATH ${build_rpath}
 
     INSTALL
     SWITCHES ${switches}
-    POST_SWITCHES OVERRIDE ${install_post_switches}
     LIB_DIRS OVERRIDE ${install_libdir}
     RPATH ${install_rpath}
 )
 
-set(wasm_switches -defaultlib=)
-# Default wasm stack is only 64kb, this is rather small, let's bump it to 1mb
-list(APPEND wasm_switches -L-z -Lstack-size=1048576)
-# Protect from stack overflow overwriting global memory
-list(APPEND wasm_switches -L--stack-first)
-if(LDC_WITH_LLD)
-    list(APPEND wasm_switches -link-internally)
-endif()
-# LLD 8+ requires (new) `--export-dynamic` for WebAssembly (https://github.com/ldc-developers/ldc/issues/3023).
-list(APPEND wasm_switches -L--export-dynamic)
-
-makeConfSection(NAME "40-ldc-wasm"
-    SECTION "^wasm(32|64)-"
-    SWITCHES ${wasm_switches}
-    LIB_DIRS OVERRIDE
-)
-
 # macOS has fat libraries; otherwise, append a separate config file section for the
 # multilib target and override the lib directory.
 if(MULTILIB AND NOT "${TARGET_SYSTEM}" MATCHES "APPLE")

runtime/ldc-build-runtime.d.in

@@ -159,8 +159,6 @@ void runCMake() {
         "-DLDMD_EXE_FULL=" ~ ldmdExecutable,
         "-DDMDFE_MINOR_VERSION=@DMDFE_MINOR_VERSION@",
         "-DDMDFE_PATCH_VERSION=@DMDFE_PATCH_VERSION@",
-        "-DLDC_WITH_LLD=@LDC_WITH_LLD@",
-        "-DINCLUDE_INSTALL_DIR=@INCLUDE_INSTALL_DIR@",
     ];
 
     if (config.targetSystem.length) args ~= "-DTARGET_SYSTEM=" ~ config.targetSystem.join(";");