From c61a966ae99b025659ddb02d773509b6903be5d5 Mon Sep 17 00:00:00 2001 From: Ayane Satomi Date: Wed, 8 Jan 2020 01:54:26 +0800 Subject: [PATCH 1/2] scripts: fix node build script being hardcoded to x86 Signed-off-by: Ayane Satomi --- scripts/node_build.bash | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/scripts/node_build.bash b/scripts/node_build.bash index a356823..63a6b9c 100755 --- a/scripts/node_build.bash +++ b/scripts/node_build.bash @@ -3,6 +3,22 @@ set -Eeuo pipefail +ARCH= +case "$(uname -m)" in + x86_64) + ARCH="x64" + ;; + aarch64) + ARCH="arm64" + ;; + armv7l) + ARCH="armv7" + ;; + *) + echo "Unsupported arch!" && exit 3 + ;; +esac + function main() { cd "$(dirname "$0")/../lib/node" @@ -32,7 +48,7 @@ function main() { echo "cores: $cores" ./configure \ - --dest-cpu=x64 \ + --dest-cpu="$ARCH" \ --link-module ./lib/nbin.js \ --link-module ./lib/_third_party_main.js \ --openssl-no-asm --openssl-use-def-ca-store From 4715bcbc50080553dab636846e3e05643d55a1c1 Mon Sep 17 00:00:00 2001 From: Ayane Satomi Date: Wed, 8 Jan 2020 03:29:02 +0800 Subject: [PATCH 2/2] ci: remove that hardcoded line entirely Signed-off-by: Ayane Satomi --- scripts/node_build.bash | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/scripts/node_build.bash b/scripts/node_build.bash index 63a6b9c..fc973c4 100755 --- a/scripts/node_build.bash +++ b/scripts/node_build.bash @@ -3,21 +3,6 @@ set -Eeuo pipefail -ARCH= -case "$(uname -m)" in - x86_64) - ARCH="x64" - ;; - aarch64) - ARCH="arm64" - ;; - armv7l) - ARCH="armv7" - ;; - *) - echo "Unsupported arch!" && exit 3 - ;; -esac function main() { cd "$(dirname "$0")/../lib/node" @@ -48,7 +33,6 @@ function main() { echo "cores: $cores" ./configure \ - --dest-cpu="$ARCH" \ --link-module ./lib/nbin.js \ --link-module ./lib/_third_party_main.js \ --openssl-no-asm --openssl-use-def-ca-store