From 74ddb0b7e84a5794b8fb9ea1d76df9acd9012188 Mon Sep 17 00:00:00 2001 From: paulober <44974737+paulober@users.noreply.github.com> Date: Wed, 11 Sep 2024 11:11:11 +0100 Subject: [PATCH] Fix #76, ARMv7 detection Signed-off-by: paulober <44974737+paulober@users.noreply.github.com> --- node-gyp-build.js | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/node-gyp-build.js b/node-gyp-build.js index 76b96e1..9000c10 100644 --- a/node-gyp-build.js +++ b/node-gyp-build.js @@ -13,7 +13,22 @@ var runtime = isElectron() ? 'electron' : (isNwjs() ? 'node-webkit' : 'node') var arch = process.env.npm_config_arch || os.arch() var platform = process.env.npm_config_platform || os.platform() var libc = process.env.LIBC || (isAlpine(platform) ? 'musl' : 'glibc') -var armv = process.env.ARM_VERSION || (arch === 'arm64' ? '8' : vars.arm_version) || '' +let armv = process.env.ARM_VERSION; +if (!armv) { + if (arch === 'arm64') { + armv = '8'; + } else if (arch === 'arm') { + // ARMv7 detection patched to avoid arm_version === "default" + // on other arm systems than arm64 ones + if (vars.arm_version === 'default') { + armv = '7'; + } else { + armv = vars.arm_version; + } + } else { + armv = ''; + } +} var uv = (process.versions.uv || '').split('.')[0] module.exports = load