Bundle arm64-ios-simulator libraries with arm64/universal macOS packages (#4974)

Author: MrcSnm

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

@@ -15,24 +15,41 @@ runs:
 
         arch='${{ inputs.arch }}'
         deployment_target='${{ inputs.ios_deployment_target }}'
-        triple="$arch-apple-ios$deployment_target${{ inputs.arch == 'x86_64' && '-simulator' || '' }}"
+
+        function add_runtime {
+          local is_simulator="$1"
+
+          local triple="$arch-apple-ios$deployment_target"
+          local sysroot='/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk'
+          local install_suffix="-ios-$arch"
+          local triple_regex="$arch-apple-ios[^-]*\$"
+          if [[ "$is_simulator" == 1 ]]; then
+            triple+='-simulator'
+            sysroot='/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk'
+            install_suffix="-ios-simulator-$arch"
+            triple_regex="$arch-apple-ios.*-simulator"
+          fi
+
+          install/bin/ldc-build-runtime --ninja \
+            --dFlags="-mtriple=$triple" \
+            --ldcSrcDir="$PWD/ldc" \
+            --installWithSuffix="$install_suffix" \
+            RT_CONF_TRIPLE_REGEX="$triple_regex" \
+            CMAKE_SYSTEM_NAME=iOS \
+            CMAKE_OSX_SYSROOT="$sysroot" \
+            CMAKE_OSX_ARCHITECTURES="$arch" \
+            CMAKE_OSX_DEPLOYMENT_TARGET="$deployment_target" \
+            BUILD_LTO_LIBS=ON
+
+          # 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${install_suffix}.conf
+        }
+
         if [[ "$arch" == arm64 ]]; then
-            sysroot='/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk'
+          add_runtime 0  # ios-arm64
+          add_runtime 1  # ios-simulator-arm64
         else
-            sysroot='/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk'
+          add_runtime 1  # ios-simulator-x86_64
         fi
 
-        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
-
-        # 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/*
+        cat install/etc/ldc2.conf/55-target-ios*.conf

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

@@ -26,6 +26,7 @@ runs:
         mv lib                            lib-x86_64
         cp -R ../ldc2-arm64/lib           lib-arm64
         cp -R ../ldc2-arm64/lib-ios-arm64 ./
+        cp -R ../ldc2-arm64/lib-ios-simulator-arm64 ./
 
         # merge executables to universal ones
         for exe in bin/*; do
@@ -40,9 +41,9 @@ runs:
 
         # ldc2.conf:
 
-        # 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/
+        # 1) x86_64 iOS-simulator: already present (55-target-ios-simulator-x86_64.conf)
+        # 2) arm64 iOS and iOS-simulator
+        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
@@ -64,7 +65,7 @@ runs:
       run: |
         set -eux
         echo 'void main() { import std.stdio; writefln("Hello world, %d bits", size_t.sizeof * 8); }' > hello.d
-        for triple in x86_64-apple-macos11.0 arm64-apple-macos11.0 x86_64-apple-ios12.0-simulator arm64-apple-ios12.0; do
+        for triple in x86_64-apple-macos11.0 arm64-apple-macos11.0 x86_64-apple-ios12.0-simulator arm64-apple-ios12.0-simulator arm64-apple-ios12.0; do
           ldc2-universal/bin/ldc2 -mtriple="$triple" hello.d
           ldc2-universal/bin/ldc2 -mtriple="$triple" hello.d -link-defaultlib-shared
           ldc2-universal/bin/ldc2 -mtriple="$triple" hello.d -O -flto=full -defaultlib=phobos2-ldc-lto,druntime-ldc-lto

.github/workflows/main.yml

@@ -217,9 +217,15 @@ jobs:
         run: |
           set -eux
           cd ..
-          triple='${{ matrix.arch }}-apple-ios12.0${{ matrix.arch == 'x86_64' && '-simulator' || '' }}'
-          installed/bin/ldc2 -mtriple="$triple" hello.d -of=hello_ios
-          installed/bin/ldc2 -mtriple="$triple" hello.d -of=hello_ios_shared -link-defaultlib-shared
+          if [[ '${{matrix.arch}}' == 'arm64' ]]; then
+              triples=('arm64-apple-ios12.0' 'arm64-apple-ios12.0-simulator')
+          else
+              triples=('x86_64-apple-ios12.0-simulator')
+          fi
+          for triple in "${triples[@]}"; do
+              installed/bin/ldc2 -mtriple="$triple" hello.d -of=hello_ios
+              installed/bin/ldc2 -mtriple="$triple" hello.d -of=hello_ios_shared -link-defaultlib-shared
+          done
 
       - name: Create package & upload artifact(s)
         uses: ./.github/actions/7-package

CHANGELOG.md

@@ -6,6 +6,7 @@
 - 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)
+- The prebuilt arm64/universal macOS packages additionally bundle the arm64 iOS-*simulator* libraries, for out-of-the-box cross-compilation support via e.g. `-mtriple=arm64-apple-ios12.0-simulator`. (#4974)
 
 #### Platform support