Merge pull request Eugeny#6276 from Jai-JAP/master

Fix armv7l builds
gradkid · Apr 25, 2022 · f653fe9 · f653fe9
2 parents 28b227b + ae82e56
commit f653fe9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/patches/builder-util+23.0.8.patch b/patches/builder-util+23.0.8.patch
@@ -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":
diff --git a/scripts/build-linux.js b/scripts/build-linux.js
@@ -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,

diff --git a/scripts/build-native.js b/scripts/build-native.js
@@ -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
 }