Merge pull request #6276 from Jai-JAP/master

Fix armv7l builds
This commit is contained in:
Eugeny 2022-04-25 13:51:54 +02:00 committed by GitHub
commit f653fe9c85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 2 deletions

View File

@ -0,0 +1,12 @@
diff --git a/node_modules/builder-util/out/arch.js b/node_modules/builder-util/out/arch.js
index eabcf47..e1ac595 100644
--- a/node_modules/builder-util/out/arch.js
+++ b/node_modules/builder-util/out/arch.js
@@ -40,6 +40,7 @@ function archFromString(name) {
return Arch.ia32;
case "arm64":
return Arch.arm64;
+ case "arm":
case "armv7l":
return Arch.armv7l;
case "universal":

View File

@ -4,7 +4,7 @@ const vars = require('./vars')
const isTag = (process.env.GITHUB_REF || '').startsWith('refs/tags/')
process.env.ARCH = (process.env.ARCH || process.arch) === 'arm' ? 'armv7l' : process.arch
process.env.ARCH = ((process.env.ARCH || process.arch) === 'arm') ? 'armv7l' : process.env.ARCH || process.arch
builder({
dir: true,

View File

@ -4,7 +4,7 @@ const path = require('path')
const vars = require('./vars')
if (process.platform === 'win32' || process.platform === 'linux') {
process.env.ARCH = (process.env.ARCH || process.arch) === 'arm' ? 'armv7l' : process.arch
process.env.ARCH = ((process.env.ARCH || process.arch) === 'arm') ? 'armv7l' : process.env.ARCH || process.arch
} else {
process.env.ARCH ??= process.arch
}