Fix missing macos arm64 in fat binary (#2886)

* Add arm64 layer to fat binary * Add changelog
metalbear-co · Oct 30, 2024 · 02c758c · 02c758c
1 parent 9dd320e
commit 02c758c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -86,7 +86,7 @@ jobs:
       - name: create universal target dir
         run: mkdir -p /tmp/target/universal-apple-darwin/release
       - name: create universal dylib
-        run: lipo -create -output /tmp/target/universal-apple-darwin/release/libmirrord_layer.dylib target/aarch64-apple-darwin/release/shim.dylib target/x86_64-apple-darwin/release/libmirrord_layer.dylib
+        run: lipo -create -output /tmp/target/universal-apple-darwin/release/libmirrord_layer.dylib target/aarch64-apple-darwin/release/shim.dylib target/aarch64-apple-darwin/release/libmirrord_layer.dylib target/x86_64-apple-darwin/release/libmirrord_layer.dylib
       - name: Sign layer universal
         env:
           AC_USERNAME: ${{ secrets.APPLE_DEVELOPER }}

diff --git a/changelog.d/2885.fixed.md b/changelog.d/2885.fixed.md
@@ -0,0 +1 @@
+Add arm64 layer to macOS fat binary.
diff --git a/scripts/build_fat_mac.sh b/scripts/build_fat_mac.sh
@@ -21,8 +21,8 @@ mkdir -p target/universal-apple-darwin/debug
 clang -arch arm64e -dynamiclib -o target/universal-apple-darwin/debug/shim.dylib mirrord/layer/shim.c
 codesign -f -s - target/universal-apple-darwin/debug/shim.dylib
 
-# Create universal binary for mirrord-layer from x86 and shim
-lipo -create -output target/universal-apple-darwin/debug/libmirrord_layer.dylib target/x86_64-apple-darwin/debug/libmirrord_layer.dylib target/universal-apple-darwin/debug/shim.dylib
+# Create universal binary for mirrord-layer from x86 and shim, as well as arm64
+lipo -create -output target/universal-apple-darwin/debug/libmirrord_layer.dylib target/x86_64-apple-darwin/debug/libmirrord_layer.dylib target/universal-apple-darwin/debug/shim.dylib target/aarch64-apple-darwin/debug/libmirrord_layer.dylib
 codesign -f -s - target/universal-apple-darwin/debug/libmirrord_layer.dylib
 
 # build mirrord package - aarch64-apple-darwin target requires MIRRORD_LAYER_FILE_MACOS_ARM64 var