From f71bda0fbff8178d92edb190fda94f2c87f8f86c Mon Sep 17 00:00:00 2001
From: zhom <2717306+zhom@users.noreply.github.com>
Date: Thu, 5 Jun 2025 22:59:51 +0400
Subject: [PATCH] build: don't set extra build variables on linux arm systems

---
 .github/workflows/release.yml         | 8 --------
 .github/workflows/rolling-release.yml | 8 --------
 nodecar/package.json                  | 2 +-
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f1dd877..246ad3f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -116,14 +116,6 @@ jobs:
             sudo apt-get install -y gcc-aarch64-linux-gnu
           fi
 
-      - name: Setup cross-compilation environment (Ubuntu ARM64 only)
-        if: matrix.platform == 'ubuntu-20.04' && matrix.arch == 'aarch64'
-        run: |
-          echo "CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
-          echo "CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++" >> $GITHUB_ENV
-          echo "AR_aarch64_unknown_linux_gnu=aarch64-linux-gnu-ar" >> $GITHUB_ENV
-          echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
-
       - name: Rust cache
         uses: swatinem/rust-cache@v2
         with:
diff --git a/.github/workflows/rolling-release.yml b/.github/workflows/rolling-release.yml
index aac8701..185ef84 100644
--- a/.github/workflows/rolling-release.yml
+++ b/.github/workflows/rolling-release.yml
@@ -102,14 +102,6 @@ jobs:
             sudo apt-get install -y gcc-aarch64-linux-gnu
           fi
 
-      - name: Setup cross-compilation environment (Ubuntu ARM64 only)
-        if: matrix.platform == 'ubuntu-20.04' && matrix.arch == 'aarch64'
-        run: |
-          echo "CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
-          echo "CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++" >> $GITHUB_ENV
-          echo "AR_aarch64_unknown_linux_gnu=aarch64-linux-gnu-ar" >> $GITHUB_ENV
-          echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
-
       - name: Rust cache
         uses: swatinem/rust-cache@v2
         with:
diff --git a/nodecar/package.json b/nodecar/package.json
index 5a07651..aa619e7 100644
--- a/nodecar/package.json
+++ b/nodecar/package.json
@@ -10,7 +10,7 @@
     "build": "tsc && pkg ./dist/index.js --targets latest-macos-arm64 --output dist/nodecar",
     "build:aarch64": "tsc && pkg ./dist/index.js --targets latest-macos-arm64 --output dist/nodecar",
     "build:x86_64": "tsc && pkg ./dist/index.js --targets latest-macos-x64 --output dist/nodecar",
-    "build:universal": "tsc && pkg ./dist/index.js --targets latest-macos-arm64 --output dist/nodecar-arm64 && pkg ./dist/index.js --targets latest-macos-x64 --output dist/nodecar-x64 && lipo -create -output dist/nodecar dist/nodecar-arm64 dist/nodecar-x64 && rm dist/nodecar-arm64 dist/nodecar-x64",
+    "build:universal": "pnpm build:aarch64 && pnpm build:x86_64",
     "build:linux-x64": "tsc && pkg ./dist/index.js --targets latest-linux-x64 --output dist/nodecar",
     "build:linux-arm64": "tsc && pkg ./dist/index.js --targets latest-linux-arm64 --output dist/nodecar",
     "build:win-x64": "tsc && pkg ./dist/index.js --targets latest-win-x64 --output dist/nodecar",