Make ldc-build-runtime --installWithSuffix install a .conf file

Either the default `50-target-default.conf` (overwriting the existing one)
if the suffix is empty, or a `55-target<suffix>.conf` one, which still
needs the triple regex patched and potentially some extra switches for
cross-compilation/linking.

Author: kinke

.github/actions/3-build-cross/action.yml

@@ -144,7 +144,6 @@ runs:
           --installWithSuffix "" \
           CMAKE_INSTALL_PREFIX="$PWD/install" \
           INCLUDE_INSTALL_DIR="$PWD/install/import" \
-          CONF_INST_DIR="$PWD/install/etc" \
           "${flags[@]}"
 
     - name: Cross-compile LDC executables

.github/actions/5a-android-x86/action.yml

@@ -24,7 +24,11 @@ runs:
         bootstrap-ldc/bin/ldc-build-runtime --ninja \
           --dFlags="-mtriple=$triple" \
           --ldcSrcDir="$PWD/ldc" \
-          --installWithSuffix="-$arch" \
+          --installWithSuffix="-android-$arch" \
           CMAKE_INSTALL_PREFIX="$PWD/installed" \
           "${flags[@]}" \
           ANDROID_ABI="$abi" # override the one in CROSS_CMAKE_FLAGS
+
+        # patch triple regex in .conf file
+        sed -i "s|default:|\"$arch-.*-linux-android\":|" installed/etc/ldc2.conf/55-target-android-$arch.conf
+        cat installed/etc/ldc2.conf/55-target-android-$arch.conf

.github/actions/5a-ios/action.yml

@@ -32,6 +32,7 @@ runs:
           CMAKE_OSX_DEPLOYMENT_TARGET="$deployment_target" \
           BUILD_LTO_LIBS=ON
 
+        # overwrite the generated .conf file (need to patch triple regex and append cross-compile flags)
         cat > installed/etc/ldc2.conf/55-target-ios-$arch.conf <<EOF
         "${arch}-apple-ios":
         {

.github/actions/merge-windows/action.yml

@@ -79,20 +79,13 @@ runs:
         ldc2-multilib\bin\ldc-build-runtime --ninja ^
           --dFlags=-mtriple=aarch64-windows-msvc ^
           "--ldcSrcDir=%CD%" ^
-          --installWithSuffix=arm64 ^
+          --installWithSuffix=-windows-arm64 ^
           BUILD_LTO_LIBS=ON
-    - name: Add arm64 section to ldc2.conf
+    - name: Patch triple regex in arm64 .conf file
       shell: pwsh
       run: |
         cd ldc2-multilib
-        $conf = '"(aarch|arm)64-.*-windows-msvc":
-        {
-            lib-dirs = [
-                "%%ldcbinarypath%%/../libarm64",
-            ];
-        };
-        '
-        Set-Content etc\ldc2.conf\55-target-windows-arm64.conf $conf
+        (cat etc\ldc2.conf\55-target-windows-arm64.conf).replace('default:', '"(aarch|arm)64-.*-windows-msvc":') | Set-Content etc\ldc2.conf\55-target-windows-arm64.conf
         cat etc\ldc2.conf\*
     - name: Run arm64 hello-world cross-compilation smoke tests
       shell: cmd

runtime/CMakeLists.txt

@@ -280,7 +280,18 @@ if(SHARED_LIBS_SUPPORTED)
     set(install_rpath "${install_libdir}")
 endif()
 
-makeConfSection(NAME "50-target-default"
+# LIB_SUFFIX is (ab)used by ldc-build-runtime and set to the optional `--installWithSuffix`.
+# If set and non-empty, change the name of the generated .conf file.
+set(conf_base_name "50-target-default")
+if(NOT "${LIB_SUFFIX}" STREQUAL "")
+    if(LIB_SUFFIX MATCHES "^-")
+        set(conf_base_name "55-target${LIB_SUFFIX}")
+    else()
+        set(conf_base_name "55-target-${LIB_SUFFIX}")
+    endif()
+endif()
+
+makeConfSection(NAME "${conf_base_name}.conf"
     SECTION "default"
 
     BUILD

runtime/ldc-build-runtime.d.in

@@ -170,7 +170,6 @@ void runCMake() {
         args ~= [
             "-DCMAKE_INSTALL_PREFIX=" ~ config.ldcExecutable.dirName.dirName,
             "-DLIB_SUFFIX=" ~ config.installWithSuffix,
-            "-DCONF_INST_DIR=", // don't install/overwrite existing etc/ldc2.conf!
         ];
     }