From c8ade79000bb5a76305015d9425cd360177d51f7 Mon Sep 17 00:00:00 2001 From: Gemma Tipper Date: Mon, 28 Oct 2024 16:01:51 +0000 Subject: [PATCH] Move shim.c to layer folder --- .github/workflows/release.yaml | 2 +- {scripts => mirrord/layer}/shim.c | 0 scripts/build_fat_mac.sh | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename {scripts => mirrord/layer}/shim.c (100%) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 52ef6221576..a4a9b776355 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -77,7 +77,7 @@ jobs: run: | cargo +nightly-2024-09-12 build --release -p mirrord-layer --target=aarch64-apple-darwin cargo +nightly-2024-09-12 build --release -p mirrord-layer --target=x86_64-apple-darwin - clang -arch arm64e -dynamiclib -o target/aarch64-apple-darwin/release/shim.dylib scripts/shim.c + clang -arch arm64e -dynamiclib -o target/aarch64-apple-darwin/release/shim.dylib mirrord/layer/shim.c - name: Sign layer binaries and code shim env: AC_USERNAME: ${{ secrets.APPLE_DEVELOPER }} diff --git a/scripts/shim.c b/mirrord/layer/shim.c similarity index 100% rename from scripts/shim.c rename to mirrord/layer/shim.c diff --git a/scripts/build_fat_mac.sh b/scripts/build_fat_mac.sh index 97631358b4d..b01e8d7770d 100755 --- a/scripts/build_fat_mac.sh +++ b/scripts/build_fat_mac.sh @@ -18,7 +18,7 @@ codesign -f -s - target/x86_64-apple-darwin/debug/libmirrord_layer.dylib mkdir -p target/universal-apple-darwin/debug # create shim to always load arm64 and sign it -clang -arch arm64e -dynamiclib -o target/universal-apple-darwin/debug/shim.dylib scripts/shim.c +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