build(next-swc): linux GLIBC compatible issue

vercel · Feb 18, 2022 · 38d6ae6 · 38d6ae6
1 parent a74af1f
commit 38d6ae6
Show file tree

Hide file tree

Showing 8 changed files with 180 additions and 471 deletions.
diff --git a/.github/workflows/build_test_deploy.yml b/.github/workflows/build_test_deploy.yml
diff --git a/packages/next-swc/.cargo/config.toml b/packages/next-swc/.cargo/config.toml
@@ -21,7 +21,7 @@ rustflags = [
 ]
 
 [target.aarch64-unknown-linux-musl]
-linker = "aarch64-linux-gnu-gcc"
+linker = "aarch64-linux-musl-gcc"
 rustflags = [
   "-C",
   "target-feature=-crt-static",

diff --git a/packages/next-swc/crates/napi/npm/android-arm-eabi/README.md b/packages/next-swc/crates/napi/npm/android-arm-eabi/README.md
@@ -0,0 +1,3 @@
+# `@next/swc-android-arm-eabi`
+
+This is the **android-arm-eabi** binary for `@next/swc`
diff --git a/packages/next-swc/crates/napi/npm/android-arm-eabi/package.json b/packages/next-swc/crates/napi/npm/android-arm-eabi/package.json
@@ -0,0 +1,18 @@
+{
+  "name": "@next/swc-android-arm-eabi",
+  "version": "0.0.0",
+  "os": [
+    "android"
+  ],
+  "cpu": [
+    "arm"
+  ],
+  "main": "next-swc.android-arm-eabi.node",
+  "files": [
+    "next-swc.android-arm-eabi.node"
+  ],
+  "license": "MIT",
+  "engines": {
+    "node": ">= 10"
+  }
+}
diff --git a/packages/next-swc/package.json b/packages/next-swc/package.json
@@ -16,6 +16,7 @@
         "armv7-unknown-linux-gnueabihf",
         "aarch64-apple-darwin",
         "aarch64-linux-android",
+        "arm-linux-androideabi",
         "x86_64-unknown-freebsd",
         "x86_64-unknown-linux-musl",
         "aarch64-unknown-linux-musl",

diff --git a/packages/next/package.json b/packages/next/package.json
@@ -115,7 +115,7 @@
     "@babel/traverse": "7.15.0",
     "@babel/types": "7.15.0",
     "@hapi/accept": "5.0.2",
-    "@napi-rs/cli": "1.2.1",
+    "@napi-rs/cli": "2.4.4",
     "@napi-rs/triples": "1.0.3",
     "@next/polyfill-module": "12.1.0",
     "@next/polyfill-nomodule": "12.1.0",

diff --git a/scripts/install-native.mjs b/scripts/install-native.mjs
@@ -19,6 +19,7 @@ import fs from 'fs-extra'
       version: '1.0.0',
       optionalDependencies: {
         '@next/swc-android-arm64': 'canary',
+        '@next/swc-android-arm-eabi': 'canary',
         '@next/swc-darwin-arm64': 'canary',
         '@next/swc-darwin-x64': 'canary',
         '@next/swc-linux-arm-gnueabihf': 'canary',

diff --git a/yarn.lock b/yarn.lock
@@ -3706,10 +3706,10 @@
     call-me-maybe "^1.0.1"
     glob-to-regexp "^0.3.0"
 
-"@napi-rs/cli@1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@napi-rs/cli/-/cli-1.2.1.tgz#eccdf9e0835aec3adcef30074bf69c110ea65960"
-  integrity sha512-7FoYn1JSK5rTIG9KcKfYnZL/O0UjUMMuzZCXd//bJdkLw0Xx9EqQJs1X/Mg4KqywJYb79LDfxRMiJRSukPGDNw==
+"@napi-rs/cli@2.4.4":
+  version "2.4.4"
+  resolved "https://registry.yarnpkg.com/@napi-rs/cli/-/cli-2.4.4.tgz#878a38f0fba1709d89d66eba706745ce728a61a5"
+  integrity sha512-f+tvwCv1ka24dBqI2DgBhR7Oxl3DKHOp4onxLXwyBFt6iCADnr3YZIr1/2Iq5r3uqxFgaf01bfPsRQZPkEp0kQ==
 
 "@napi-rs/triples@1.0.3", "@napi-rs/triples@^1.0.3":
   version "1.0.3"