Skip to content

Commit 0e6f6ff

Browse files
committed
add linker env arg
1 parent 920e82c commit 0e6f6ff

File tree

2 files changed

+9
-12
lines changed

2 files changed

+9
-12
lines changed

.github/workflows/CI.yml

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,14 @@ jobs:
5050
# docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64
5151
build: |
5252
uname -a
53-
echo "fetching zig tar"
53+
# echo "fetching zig tar"
5454
# curl --output zig-linux-x86_64-0.13.0.tar.xz https://ziglang.org/download/0.13.0/zig-linux-x86_64-0.13.0.tar.xz
55-
curl --output zig-linux-aarch64-0.13.0.tar.xz https://ziglang.org/download/0.13.0/zig-linux-aarch64-0.13.0.tar.xz
56-
echo "unzipping zig"
55+
# echo "unzipping zig"
5756
# tar xf zig-linux-x86_64-0.13.0.tar.xz
58-
tar xf zig-linux-aarch64-0.13.0.tar.xz
59-
pwd
60-
ls
61-
echo "exporting path"
57+
# pwd
58+
# ls
59+
# echo "exporting path"
6260
# export PATH=$PATH:$(pwd)/zig-linux-x86_64-0.13.0
63-
export PATH=$PATH:$(pwd)/zig-linux-aarch64-0.13.0
6461
6562
6663
# echo "installing cross-compilation tools"
@@ -73,18 +70,18 @@ jobs:
7370
7471
7572
76-
echo "zig version"
77-
zig version
73+
# echo "zig version"
74+
# zig version
7875
# # Download libsodium
7976
mkdir libsodium
8077
curl -L --output ./libsodium/LATEST.tar.gz https://github.com/matthme/holochain-binaries/releases/download/libsodium-releases/LATEST.tar.gz
8178
curl -L --output ./libsodium/LATEST.tar.gz.minisig https://github.com/matthme/holochain-binaries/releases/download/libsodium-releases/LATEST.tar.gz.minisig
8279
curl -L --output ./libsodium/libsodium-1.0.19-stable.zip https://github.com/matthme/holochain-binaries/releases/download/libsodium-releases/libsodium-1.0.19-stable.zip
8380
curl -L --output ./libsodium/libsodium-1.0.19-stable.zip.minisig https://github.com/matthme/holochain-binaries/releases/download/libsodium-releases/libsodium-1.0.19-stable.zip.minisig
8481
82+
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc SODIUM_DIST_DIR="$(pwd)/libsodium" yarn build --target aarch64-unknown-linux-gnu
8583
# yarn build --target aarch64-unknown-linux-gnu
8684
# SODIUM_DIST_DIR="$(pwd)/libsodium" yarn build --target aarch64-unknown-linux-gnu
87-
SODIUM_DIST_DIR="$(pwd)/libsodium" yarn build --zig --target aarch64-unknown-linux-gnu
8885
# yarn build --target aarch64-unknown-linux-gnu --zig-abi-suffix=gnu
8986
9087
# - host: ubuntu-latest

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
},
2929
"scripts": {
3030
"artifacts": "napi artifacts",
31-
"build": "napi build --platform --release --cargo-flags=\"--locked\" --zig",
31+
"build": "napi build --platform --release --cargo-flags=\"--locked\"",
3232
"build:debug": "napi build --platform",
3333
"prepublishOnly": "napi prepublish -t npm",
3434
"test": "ava",

0 commit comments

Comments
 (0)