fix: aarch64-apple-darwin (macOS m1 chips) build [skip skia]

Brooooooklyn · Sep 24, 2021 · 4deee73 · 4deee73 · github-actions · Sep 24, 2021
1 parent adfe755
commit 4deee73
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml
@@ -51,7 +51,13 @@ jobs:
           - host: macos-latest
             downloadTarget: 'aarch64-apple-darwin'
             target: 'aarch64-apple-darwin'
-            build: pnpm build -- --target=aarch64-apple-darwin
+            build: |
+              sudo rm -Rf /Library/Developer/CommandLineTools/SDKs/*;
+              export CC=$(xcrun -f clang);
+              export CXX=$(xcrun -f clang++);
+              SYSROOT=$(xcrun --sdk macosx --show-sdk-path);
+              export CFLAGS="-isysroot $SYSROOT -isystem $SYSROOT";
+              pnpm build -- --target=aarch64-apple-darwin
           - host: ubuntu-18.04
             downloadTarget: 'aarch64-unknown-linux-gnu'
             target: 'aarch64-unknown-linux-gnu'

diff --git a/build.rs b/build.rs
@@ -78,7 +78,7 @@ fn main() {
         ));
     }
     "aarch64-apple-darwin" => {
-      build.target("arm64-apple-darwin");
+      build.target("arm64-apple-macos");
     }
     "aarch64-linux-android" => {
       let nkd_home = env::var("ANDROID_NDK_HOME").unwrap();

diff --git a/scripts/build-skia.js b/scripts/build-skia.js
@@ -176,10 +176,10 @@ switch (TARGET_TRIPLE) {
     break
   case 'aarch64-apple-darwin':
     ExtraSkiaBuildFlag += ' target_cpu="arm64" target_os="mac"'
-    ExtraCflagsCC += ', "--target=arm64-apple-darwin"'
-    ExtraLdFlags = '"--target=arm64-apple-darwin"'
-    ExtraAsmFlags = '"--target=arm64-apple-darwin"'
-    ExtraCflags = '"--target=arm64-apple-darwin"'
+    ExtraCflagsCC += ', "--target=arm64-apple-macos"'
+    ExtraLdFlags = '"--target=arm64-apple-macos"'
+    ExtraAsmFlags = '"--target=arm64-apple-macos"'
+    ExtraCflags = '"--target=arm64-apple-macos"'
     GN_ARGS.push(
       `extra_ldflags=[${ExtraLdFlags}]`,
       `extra_asmflags=[${ExtraAsmFlags}]`,

diff --git a/skia b/skia
+3 −3		infra/bots/gen_tasks_logic/gen_tasks_logic.go
+58 −58		infra/bots/tasks.json
Benchmark suite	Current: `4deee73`	Previous: `3fe6772`	Ratio
`Draw house#skia-canvas`	`22` ops/sec (`±0.27%`)	`23` ops/sec (`±0.46%`)	`1.05`
`Draw house#node-canvas`	`19` ops/sec (`±0.6%`)	`20` ops/sec (`±0.42%`)	`1.05`
`Draw house#@napi-rs/skia`	`21` ops/sec (`±0.66%`)	`21` ops/sec (`±0.38%`)	`1`
`Draw gradient#skia-canvas`	`21` ops/sec (`±0.62%`)	`22` ops/sec (`±0.54%`)	`1.05`
`Draw gradient#node-canvas`	`19` ops/sec (`±0.22%`)	`19` ops/sec (`±0.34%`)	`1`
`Draw gradient#@napi-rs/skia`	`20` ops/sec (`±0.13%`)	`20` ops/sec (`±0.5%`)	`1`