From 734165f42e2fc3f29762415e6baad847d38f06f1 Mon Sep 17 00:00:00 2001 From: paulober <44974737+paulober@users.noreply.github.com> Date: Wed, 11 Sep 2024 13:31:07 +0100 Subject: [PATCH] Fix #76, ARMv7 detection Signed-off-by: paulober <44974737+paulober@users.noreply.github.com> --- node-gyp-build.js | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/node-gyp-build.js b/node-gyp-build.js index 181f9a4..9000c10 100644 --- a/node-gyp-build.js +++ b/node-gyp-build.js @@ -13,8 +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') -// ARMv7 detection patched to avoid arm_version === "default" on other arm systems than arm64 ones -var armv = process.env.ARM_VERSION || (arch === 'arm64' ? '8' : (arch === 'arm' ? (vars.arm_version === 'default' ? '7' : 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