CMake: Install ldc2.conf when installing the runtime, not the compiler

Author: kinke

.github/actions/5-install/action.yml

@@ -18,16 +18,20 @@ runs:
         if [[ '${{ inputs.cross_compiling }}' != true ]]; then
           ninja -C build install >/dev/null
         else
+          # populate first subdirs by installing the cross-compiled compiler:
+          # * bin/: executables
+          # * lib/: LTO plugin and compiler-rt libs only
+          # * etc/bash_completion.d/
           ninja -C build-cross install
 
-          mkdir -p install/lib
-          cp -a build-cross-libs/lib/* install/lib/
+          # install the cross-compiled libs to populate:
+          # * lib/: runtime library artifacts
+          # * etc/ldc2.conf
+          # * import/: missing ldc/gccbuiltins_*.di
+          ninja -C build-cross-libs install
 
-          mkdir -p install/etc
-          cp build-cross-libs/etc/ldc2_install.conf install/etc/ldc2.conf
-          cat install/etc/ldc2.conf
-
-          # use imports from installed bootstrap compiler
+          # use imports from installed bootstrap compiler (incl. ldc/gccbuiltins_*.di)
+          rm -rf install/import
           ninja -C bootstrap-ldc install >/dev/null
           mv bootstrap-install/import install/
         fi

CMakeLists.txt

@@ -137,7 +137,7 @@ endif()
 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(CONF_INST_DIR ${SYSCONF_INSTALL_DIR} CACHE PATH "Directory ldc.conf is installed to")
+set(CONF_INST_DIR ${SYSCONF_INSTALL_DIR} CACHE PATH "Directory ldc2.conf is installed 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.")
@@ -978,9 +978,6 @@ if(${BUILD_SHARED})
     # as well, for the time being this just bloats the normal packages.
     install(TARGETS ${LDC_LIB} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
 endif()
-if(NOT CMAKE_CROSSCOMPILING) # ldc2.conf generated by runtime CMake script, excluded when cross-compiling
-    install(FILES ${PROJECT_BINARY_DIR}/etc/${LDC_EXE}_install.conf DESTINATION ${CONF_INST_DIR} RENAME ${LDC_EXE}.conf)
-endif()
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
     if(NOT DEFINED BASH_COMPLETION_COMPLETIONSDIR)

runtime/CMakeLists.txt

@@ -360,6 +360,11 @@ if(MULTILIB AND NOT "${TARGET_SYSTEM}" MATCHES "APPLE")
     )
 endif()
 
+if(NOT DEFINED CONF_INST_DIR) # set by parent LDC build
+    set(CONF_INST_DIR "${CMAKE_INSTALL_PREFIX}/etc")
+endif()
+install(FILES ${install_conf_path} DESTINATION ${CONF_INST_DIR} RENAME ${CONFIG_BASE}.conf)
+
 #
 # druntime/Phobos compilation helpers.
 #