Merge pull request #4978 from kinke/conf_shuffle

kinke · web-flow · commit 789efab995c0 · 2025-09-27T14:27:50.000+02:00
ldc2.conf dir: Slightly shuffle order and file names, and make `ldc-build-runtime --installWithSuffix` install a .conf file
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -67,11 +67,12 @@ packaging_steps_template: &PACKAGING_STEPS_TEMPLATE
     cd ..
     perl -pi -e s?$PWD/install/?%%ldcbinarypath%%/../?g install/etc/ldc2.conf/*
     if [[ "$CI_OS" == "freebsd" ]]; then
-      cat > install/etc/ldc2.conf/35-ldc-default-CC.conf <<EOF
+      cat > install/etc/ldc2.conf/31-compiler-default-CC.conf <<EOF
+    // Default to the clang version matching LDC's LLVM version.
     "default":
     {
         switches ~= [ "-gcc=${CC}" ];
-    }
+    };
     EOF
     fi
     cp $CIRRUS_WORKING_DIR/{LICENSE,packaging/README} install
diff --git a/.github/actions/3-build-cross/action.yml b/.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
diff --git a/.github/actions/5-install/action.yml b/.github/actions/5-install/action.yml
@@ -20,11 +20,12 @@ runs:
         else
           # the cross-compiled runtime libs have already been installed:
           # * lib/: runtime library artifacts
-          # * etc/ldc2.conf/30-ldc-runtime-lib.conf
+          # * etc/ldc2.conf/: 50-target-default.conf
 
           # now extend by installing the cross-compiled compiler:
           # * bin/: executables
           # * lib/: LTO plugin and compiler-rt libs
+          # * etc/ldc2.conf/: 00-docs.conf, 30-compiler.conf, 55-target-wasm.conf, 70-compiler-rt.conf
           # * etc/bash_completion.d/
           # * import/: all runtime imports except for ldc/gccbuiltins_*.di
           ninja -C build-cross install
@@ -40,32 +41,14 @@ runs:
           cp ldc/packaging/README install/
         fi
 
-    - name: Make portable
-      shell: bash
-      run: |
-        set -eux
-        cd ..
-        absInstallDir="$PWD/install"
-        if [[ '${{ runner.os }}' == Windows ]]; then
-          # /d/a/1/install => D:/a/1/install
-          absInstallDir=$(cygpath --mixed "$absInstallDir")
-        fi
-        confs=( install/etc/ldc2.conf/* )
-        perl -pi -e "s|$absInstallDir/|%%ldcbinarypath%%/../|g" "${confs[@]}"
-        cat "${confs[@]}"
-
-    - name: Rename the installation dir to test portability
-      shell: bash
-      run: mv ../install ../installed
-
     - name: 'Windows: Copy curl & MinGW-w64-based libs'
       if: runner.os == 'Windows'
       shell: bash
       run: |
         set -eux
         cd ..
 
-        cp libcurl/ldc2/* installed/bin/
+        cp libcurl/ldc2/* install/bin/
 
         curl -fL --retry 3 --max-time 60 -o mingw-w64-libs.7z \
           https://github.com/ldc-developers/mingw-w64-libs/releases/download/v8.0.0/mingw-w64-libs-v8.0.0.7z
@@ -79,4 +62,4 @@ runs:
         else
           model=64
         fi
-        cp -r "lib$model" ../installed/lib/mingw
+        cp -r "lib$model" ../install/lib/mingw
diff --git a/.github/actions/5a-android-x86/action.yml b/.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" \
-          CMAKE_INSTALL_PREFIX="$PWD/installed" \
+          --installWithSuffix="-android-$arch" \
+          CMAKE_INSTALL_PREFIX="$PWD/install" \
+          RT_CONF_TRIPLE_REGEX="$arch-.*-linux-android" \
           "${flags[@]}" \
           ANDROID_ABI="$abi" # override the one in CROSS_CMAKE_FLAGS
+
+        # TODO: append default -gcc switch (x86_64-linux-android30-clang, i686-linux-android29-clang)
+        cat install/etc/ldc2.conf/55-target-android-$arch.conf
diff --git a/.github/actions/5a-ios/action.yml b/.github/actions/5a-ios/action.yml
@@ -22,26 +22,17 @@ runs:
             sysroot='/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk'
         fi
 
-        installed/bin/ldc-build-runtime --ninja \
+        install/bin/ldc-build-runtime --ninja \
           --dFlags="-mtriple=$triple" \
           --ldcSrcDir="$PWD/ldc" \
           --installWithSuffix="-ios-$arch" \
+          RT_CONF_TRIPLE_REGEX="$arch-apple-ios" \
           CMAKE_SYSTEM_NAME=iOS \
           CMAKE_OSX_SYSROOT="$sysroot" \
           CMAKE_OSX_ARCHITECTURES="$arch" \
           CMAKE_OSX_DEPLOYMENT_TARGET="$deployment_target" \
           BUILD_LTO_LIBS=ON
 
-        section="\"$arch-apple-ios\":
-        {
-            switches ~= [
-                \"-Xcc=-isysroot\",
-                \"-Xcc=$sysroot\",
-            ];
-            lib-dirs = [
-                \"%%ldcbinarypath%%/../lib-ios-$arch\",
-            ];
-            rpath = \"%%ldcbinarypath%%/../lib-ios-$arch\";
-        };"
-        echo "$section" >> installed/etc/ldc2.conf/31-ldc-runtime-lib-ios-$arch.conf
-        cat installed/etc/ldc2.conf/*
+        # append cross-compile flags to generated .conf file
+        sed -i "" "s|^{\$|{\n    switches ~= [\n        \"-Xcc=-isysroot\",\n        \"-Xcc=${sysroot}\",\n    ];|" install/etc/ldc2.conf/55-target-ios-$arch.conf
+        cat install/etc/ldc2.conf/*
diff --git a/.github/actions/5b-make-portable/action.yml b/.github/actions/5b-make-portable/action.yml
@@ -0,0 +1,22 @@
+name: Make LDC installation portable
+runs:
+  using: composite
+  steps:
+
+    - name: Make portable
+      shell: bash
+      run: |
+        set -eux
+        cd ..
+        absInstallDir="$PWD/install"
+        if [[ '${{ runner.os }}' == Windows ]]; then
+          # /d/a/1/install => D:/a/1/install
+          absInstallDir=$(cygpath --mixed "$absInstallDir")
+        fi
+        confs=( install/etc/ldc2.conf/* )
+        perl -pi -e "s|$absInstallDir/|%%ldcbinarypath%%/../|g" "${confs[@]}"
+        cat "${confs[@]}"
+
+    - name: Rename the installation dir to test portability
+      shell: bash
+      run: mv ../install ../installed
diff --git a/.github/actions/merge-macos/action.yml b/.github/actions/merge-macos/action.yml
@@ -40,14 +40,13 @@ runs:
 
         # ldc2.conf:
 
-        # 1) x86_64 ios config
-        # already present
-        # 2) arm64 ios config
-        cp ../ldc2-arm64/etc/ldc2.conf/31-ldc-runtime-lib-ios-arm64.conf etc/ldc2.conf
-        # 3) x86_64 & arm64 macos
-        rm etc/ldc2.conf/30-ldc-runtime-lib.conf # the old ldc2-x86_64 config
+        # 1) x86_64 iOS: already present (55-target-ios-x86_64.conf)
+        # 2) arm64 iOS config
+        cp ../ldc2-arm64/etc/ldc2.conf/55-target-ios-arm64.conf etc/ldc2.conf/
+        # 3) x86_64 & arm64 macOS
+        rm etc/ldc2.conf/50-target-default.conf # the original x86_64 config
         for arch in x86_64 arm64; do
-          cat > etc/ldc2.conf/30-ldc-runtime-lib-${arch}.conf <<EOF
+          cat > etc/ldc2.conf/50-target-default-${arch}.conf <<EOF
         "${arch}-apple-":
         {
             lib-dirs = [
diff --git a/.github/actions/merge-windows/action.yml b/.github/actions/merge-windows/action.yml
@@ -20,22 +20,21 @@ runs:
         mv ldc2-*-x64 ldc2-multilib
         cd ldc2-multilib
         mv lib lib64
-        mv etc/ldc2.conf/30-ldc-runtime-{lib,lib64}.conf
         cp -R ../ldc2-x86/lib lib32
         cp ../ldc2-x86/bin/{*.dll,*.pdb,curl-ca-bundle.crt} lib32/
     - name: Merge ldc2.conf
       shell: pwsh
       run: |
         cd ldc2-multilib
-        (cat etc\ldc2.conf\30-ldc-runtime-lib64.conf).replace('%%ldcbinarypath%%/../lib', '%%ldcbinarypath%%/../lib64') | Set-Content etc\ldc2.conf\30-ldc-runtime-lib64.conf
+        (cat etc\ldc2.conf\50-target-default.conf).replace('%%ldcbinarypath%%/../lib', '%%ldcbinarypath%%/../lib64') | Set-Content etc\ldc2.conf\50-target-default.conf
         $conf32 = '"i[3-6]86-.*-windows-msvc":
         {
             lib-dirs = [
                 "%%ldcbinarypath%%/../lib32",
             ];
         };
         '
-        Set-Content etc\ldc2.conf\31-ldc-runtime-lib32.conf $conf32
+        Set-Content etc\ldc2.conf\55-target-windows-x86.conf $conf32
         cat etc\ldc2.conf\*
 
     - name: Generate hello.d
@@ -80,21 +79,18 @@ runs:
         ldc2-multilib\bin\ldc-build-runtime --ninja ^
           --dFlags=-mtriple=aarch64-windows-msvc ^
           "--ldcSrcDir=%CD%" ^
-          --installWithSuffix=arm64 ^
+          --installWithSuffix=-windows-arm64 ^
+          RT_CONF_TRIPLE_REGEX="(aarch|arm)64-.*-windows-msvc" ^
           BUILD_LTO_LIBS=ON
-    - name: Add arm64 section to ldc2.conf
-      shell: pwsh
+    - name: Make arm64 .conf file portable
+      shell: bash
       run: |
+        set -eux
         cd ldc2-multilib
-        $conf = '"(aarch|arm)64-.*-windows-msvc":
-        {
-            lib-dirs = [
-                "%%ldcbinarypath%%/../libarm64",
-            ];
-        };
-        '
-        Set-Content etc\ldc2.conf\31-ldc-runtime-libarm64.conf $conf
-        cat etc\ldc2.conf\*
+        absInstallDir=$(cygpath --mixed "$PWD")
+        conf="etc/ldc2.conf/55-target-windows-arm64.conf"
+        sed -i "s|$absInstallDir/|%%ldcbinarypath%%/../|g" $conf
+        cat $conf
     - name: Run arm64 hello-world cross-compilation smoke tests
       shell: cmd
       run: |
@@ -111,9 +107,9 @@ runs:
         curl -fL --retry 3 --max-time 60 -o libcurl.zip "$url"
         7z x libcurl.zip >/dev/null
         rm libcurl.zip
-        cp curl-*/bin/{libcurl*.dll,curl-ca-bundle.crt} ldc2-multilib/libarm64/
+        cp curl-*/bin/{libcurl*.dll,curl-ca-bundle.crt} ldc2-multilib/lib-windows-arm64/
         rm -rf curl-*
-        mv ldc2-multilib/libarm64/libcurl*.dll ldc2-multilib/libarm64/libcurl.dll
+        mv ldc2-multilib/lib-windows-arm64/libcurl*.dll ldc2-multilib/lib-windows-arm64/libcurl.dll
 
     - name: Pack multilib package
       shell: bash
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -196,7 +196,7 @@ jobs:
         with:
           arch: ${{ matrix.arch }}
 
-      - name: Install LDC & make portable
+      - name: Install LDC
         uses: ./.github/actions/5-install
         with:
           arch: ${{ matrix.arch }}
@@ -205,6 +205,8 @@ jobs:
         uses: ./.github/actions/5a-ios
         with:
           arch: ${{ matrix.arch }}
+      - name: Make portable
+        uses: ./.github/actions/5b-make-portable
 
       - name: Run a few integration tests against the installed compiler
         uses: ./.github/actions/6-integration-test
@@ -277,7 +279,7 @@ jobs:
           cmake_flags: ${{ matrix.extra_cmake_flags }}
           with_pgo: ${{ matrix.with_pgo }}
 
-      - name: Install LDC & make portable
+      - name: Install LDC
         uses: ./.github/actions/5-install
         with:
           cross_compiling: true
@@ -286,6 +288,8 @@ jobs:
         uses: ./.github/actions/5a-android-x86
         with:
           arch: ${{ matrix.android_x86_arch }}
+      - name: Make portable
+        uses: ./.github/actions/5b-make-portable
 
       - name: Create package & upload artifact(s)
         uses: ./.github/actions/7-package
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 - Frontend, druntime and Phobos are at version ~[2.112.0](https://dlang.org/changelog/2.112.0.html), incl. new command-line options `-extI`, `-dllimport=externalOnly` and `-edition`. (#4949, #4962)
 - **Breaking change for dcompute**: The special `@kernel` UDA is now a function and _**requires**_ parentheses as in `@kernel() void foo(){}`. Optionally you can provide launch dimensions, `@kernel([2,4,8])`, to specify to the compute runtime how the kernel is intended to be launched.
 - ldc2.conf can now be a directory. All the files inside it, ordered naturally, will be concatenated and treated like a big config. (#4954)
+  - Running `ldc-build-runtime --installWithSuffix` now includes installing a target-specific .conf file to that directory. (#4978)
 - **Breaking change for ldc2.conf cmake generation**: The `cmake` build process now generates the `ldc2.conf` and `ldc2_install.conf` as directories. `ldc2*.conf.in` and `ADDITIONAL_DEFAULT_LDC_SWITCHES` have been removed, if you need to add switches check out `makeConfSection` in `LdcConfig.cmake`. (#4954)
 
 #### Platform support
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -962,13 +962,9 @@ 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"
+makeConfSection(NAME "30-compiler" SECTION "default"
     BUILD
     SWITCHES ${switches}
     # -defaultlib is configure in runtime/CMakeLists.txt
@@ -977,12 +973,10 @@ makeConfSection(NAME "35-ldc-compiler" SECTION "default"
         "-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)
@@ -997,12 +991,24 @@ 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"
+makeConfSection(NAME "55-target-wasm"
     SECTION "^wasm(32|64)-"
     SWITCHES ${wasm_switches}
     LIB_DIRS OVERRIDE
 )
 
+if(DEFINED COMPILER_RT_LIBDIR_CONFIG)
+    message(STATUS "Adding ${COMPILER_RT_LIBDIR_CONFIG} to lib-dirs in configuration file")
+
+    makeConfSection(NAME "70-compiler-rt" SECTION "default"
+        BUILD
+        LIB_DIRS ${COMPILER_RT_LIBDIR_CONFIG}
+
+        INSTALL
+        LIB_DIRS ${COMPILER_RT_LIBDIR_CONFIG}
+    )
+endif()
+
 #
 # Test and runtime targets. Note that enable_testing() is order-sensitive!
 #
diff --git a/packaging/windows_installer.iss b/packaging/windows_installer.iss
@@ -29,10 +29,10 @@ SolidCompression=yes
 Name: "english"; MessagesFile: "compiler:Default.isl"
 
 [Files]
-Source: "{#LDCDir}\*"; Excludes: "\lib32,\lib64,\libarm64"; DestDir: "{app}"; Components: core; Flags: ignoreversion recursesubdirs
+Source: "{#LDCDir}\*"; Excludes: "\lib32,\lib64,\lib-windows-arm64"; DestDir: "{app}"; Components: core; Flags: ignoreversion recursesubdirs
 Source: "{#LDCDir}\lib64\*"; DestDir: "{app}\lib64"; Components: lib64; Flags: ignoreversion recursesubdirs
 Source: "{#LDCDir}\lib32\*"; DestDir: "{app}\lib32"; Components: lib32; Flags: ignoreversion recursesubdirs
-Source: "{#LDCDir}\libarm64\*"; DestDir: "{app}\libarm64"; Components: libarm64; Flags: ignoreversion recursesubdirs
+Source: "{#LDCDir}\lib-windows-arm64\*"; DestDir: "{app}\lib-windows-arm64"; Components: libarm64; Flags: ignoreversion recursesubdirs
 
 [Components]
 Name: core; Description: "Executables, config file and imports"; Types: full compact custom; Flags: fixed
diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
@@ -280,8 +280,13 @@ if(SHARED_LIBS_SUPPORTED)
     set(install_rpath "${install_libdir}")
 endif()
 
-makeConfSection(NAME "30-ldc-runtime-lib${LIB_SUFFIX}"
-    SECTION "default"
+# This is e.g. set from `ldc-build-runtime --installWithSuffix`.
+set(RT_CONF_BASE_NAME "50-target-default" CACHE STRING "Base name of the generated runtime .conf file")
+
+set(RT_CONF_TRIPLE_REGEX "default" CACHE STRING "Regex for the target triple in the generated runtime .conf file")
+
+makeConfSection(NAME ${RT_CONF_BASE_NAME}
+    SECTION ${RT_CONF_TRIPLE_REGEX}
 
     BUILD
     SWITCHES ${switches}
@@ -304,7 +309,7 @@ if(MULTILIB AND NOT "${TARGET_SYSTEM}" MATCHES "APPLE")
         set(install_rpath "${install_libdir}")
     endif()
 
-    set(name "31-ldc-runtime-lib${MULTILIB_SUFFIX}")
+    set(name "55-target-m${MULTILIB_SUFFIX}")
     set(sectionPlaceholder "LDC_CONF_MULTILIB_TRIPLE_REGEX")
     makeConfSection(NAME "${name}"
         SECTION "${sectionPlaceholder}"
diff --git a/runtime/ldc-build-runtime.d.in b/runtime/ldc-build-runtime.d.in
