fix binary builds

Author: ztanner

.github/workflows/build_and_deploy.yml

@@ -249,10 +249,12 @@ jobs:
           node-version: ${{ env.NODE_LTS_VERSION }}
           check-latest: true
 
+      - name: Prepare corepack
+        if: ${{ matrix.os != 'windows' }}
+        run: npm i -g corepack@0.31
+
       - name: Setup corepack
-        run: |
-          npm i -g corepack@0.31
-          corepack enable
+        run: corepack enable
 
       # we always want to run this to set environment variables
       # (skip for docker builds - rust is already in the image)

crates/next-napi-bindings/build.rs

@@ -4,7 +4,12 @@ use serde_json::Value;
 
 fn main() -> anyhow::Result<()> {
     println!("cargo:rerun-if-env-changed=CI");
+    println!("cargo:rerun-if-env-changed=CARGO_CFG_TARGET_OS");
+    println!("cargo:rerun-if-env-changed=CARGO_CFG_TARGET_ARCH");
     let is_ci = env::var("CI").is_ok_and(|value| !value.is_empty());
+    let is_macos_aarch64_target = env::var("CARGO_CFG_TARGET_OS")
+        .is_ok_and(|value| value == "macos")
+        && env::var("CARGO_CFG_TARGET_ARCH").is_ok_and(|value| value == "aarch64");
 
     let nextjs_version = {
         let package_json_path = Path::new(env!("CARGO_MANIFEST_DIR"))
@@ -68,12 +73,12 @@ fn main() -> anyhow::Result<()> {
         _ => println!("cargo:warning=`git rev-parse HEAD` failed"),
     }
 
-    #[cfg(not(all(target_os = "macos", target_arch = "aarch64")))]
-    napi_build::setup();
+    if !is_macos_aarch64_target {
+        napi_build::setup();
+    }
 
     // This is a workaround for napi always including a GCC specific flag.
-    #[cfg(all(target_os = "macos", target_arch = "aarch64"))]
-    {
+    if is_macos_aarch64_target {
         println!("cargo:rerun-if-env-changed=DEBUG_GENERATED_CODE");
         println!("cargo:rerun-if-env-changed=TYPE_DEF_TMP_PATH");
         println!("cargo:rerun-if-env-changed=CARGO_CFG_NAPI_RS_CLI_VERSION");

scripts/native-builder.Dockerfile

@@ -10,11 +10,14 @@
 #   - Ubuntu 20.04 (glibc 2.31 — broad compatibility baseline)
 #   - Clang/LLD for all compilation and linking via --target
 #   - GNU cross-sysroots via crossbuild-essential (Ubuntu multiarch)
-#   - musl sysroots from musl.cc (headers + libs only; clang/lld do the work)
+#   - musl sysroots from GHCR-hosted rust-musl-cross images
 #   - Node.js 20 (glibc-linked, used as build tool for all targets)
 #   - Rust nightly toolchain (pinned to match rust-toolchain.toml)
 #   - @napi-rs/cli for building native Node.js addons
 
+FROM ghcr.io/rust-cross/rust-musl-cross:x86_64-musl AS musl_x86_64
+FROM ghcr.io/rust-cross/rust-musl-cross:aarch64-musl AS musl_aarch64
+
 FROM ubuntu:20.04 AS builder
 
 # Avoid interactive prompts during apt-get
@@ -54,19 +57,20 @@ RUN apt-get update && apt-get install -y --no-install-recommends curl ca-certifi
     crossbuild-essential-amd64 crossbuild-essential-arm64 \
     && rm -rf /var/lib/apt/lists/*
 
-# Download musl cross-toolchains from musl.cc for their sysroots
-# (headers, crt files, libc, libgcc). Clang + rust-lld handle compilation
-# and linking; we only need the target libraries.
-# Also copy GCC's crt files and libgcc into the sysroot lib dir — clang 10
-# doesn't search the --gcc-toolchain path for these files.
-# https://musl.cc/
-RUN cd /opt && \
-    for TRIPLE in aarch64-linux-musl x86_64-linux-musl; do \
-      wget -qO- "https://musl.cc/${TRIPLE}-cross.tgz" | tar xz && \
-      cp /opt/${TRIPLE}-cross/lib/gcc/${TRIPLE}/*/crt*.o \
-         /opt/${TRIPLE}-cross/lib/gcc/${TRIPLE}/*/libgcc.a \
-         /opt/${TRIPLE}-cross/${TRIPLE}/lib/; \
-    done
+# Import prebuilt musl sysroots from the rust-musl-cross images and stage them
+# under /opt/*-cross for docker-native-build.sh. The symlinks provide the
+# target names that our clang --sysroot flags use, and libgcc/crt objects are
+# copied into the sysroot lib dir so clang/rust-lld can find them while linking.
+COPY --from=musl_x86_64 /usr/local/musl /opt/x86_64-linux-musl-cross
+COPY --from=musl_aarch64 /usr/local/musl /opt/aarch64-linux-musl-cross
+RUN ln -s x86_64-unknown-linux-musl /opt/x86_64-linux-musl-cross/x86_64-linux-musl && \
+    ln -s aarch64-unknown-linux-musl /opt/aarch64-linux-musl-cross/aarch64-linux-musl && \
+    cp /opt/x86_64-linux-musl-cross/lib/gcc/x86_64-unknown-linux-musl/*/crt*.o \
+       /opt/x86_64-linux-musl-cross/lib/gcc/x86_64-unknown-linux-musl/*/libgcc.a \
+       /opt/x86_64-linux-musl-cross/x86_64-linux-musl/lib/ && \
+    cp /opt/aarch64-linux-musl-cross/lib/gcc/aarch64-unknown-linux-musl/*/crt*.o \
+       /opt/aarch64-linux-musl-cross/lib/gcc/aarch64-unknown-linux-musl/*/libgcc.a \
+       /opt/aarch64-linux-musl-cross/aarch64-linux-musl/lib/
 
 # Install Rust — pinned nightly from rust-toolchain.toml
 # The COPY of rust-toolchain.toml ensures the image rebuilds when the toolchain changes.