From 44894203e7f309cbac52bf5e062d0ed25213ac3b Mon Sep 17 00:00:00 2001 From: Josh Abernathy Date: Sun, 17 Jan 2016 00:07:50 -0500 Subject: [PATCH 1/3] Force 32-bit binaries from node-pre-gyp. --- script/bootstrap | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/script/bootstrap b/script/bootstrap index 72c12aedf..f3b210d2a 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -89,6 +89,11 @@ function bootstrap() { // proper binaries. var electronVersion = require('../package.json').electronVersion; moduleInstallEnv.npm_config_target = electronVersion; + + // Atom on Windows is always 32-bit currently. + if (process.platform === 'win32') { + moduleInstallEnv.npm_config_target_arch = 'ia32'; + } var moduleInstallOptions = {env: moduleInstallEnv}; if (process.argv.indexOf('--no-quiet') === -1) { From e87c90449e9f800123d417ad24594bb08b7db543 Mon Sep 17 00:00:00 2001 From: Josh Abernathy Date: Sun, 17 Jan 2016 15:45:30 -0500 Subject: [PATCH 2/3] Revert "Always set the architecture to ia32 on Windows." This reverts commit 5c77effc207fbe383a95b4b01c28a491d5e67039. --- script/bootstrap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/bootstrap b/script/bootstrap index f3b210d2a..6eebebe9a 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -107,7 +107,7 @@ function bootstrap() { // apm ships with 32-bit node so make sure its native modules are compiled // for a 32-bit target architecture - if (process.platform === 'win32') + if (process.env.JANKY_SHA1 && process.platform === 'win32') apmInstallCommand += ' --arch=ia32'; var commands = [ From 032a734325cfcab15792458174648a5a9126f6fa Mon Sep 17 00:00:00 2001 From: Josh Abernathy Date: Sun, 17 Jan 2016 15:47:18 -0500 Subject: [PATCH 3/3] A better description of why we're forcing 32-bit. --- script/bootstrap | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/script/bootstrap b/script/bootstrap index 6eebebe9a..83ec712ff 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -90,7 +90,8 @@ function bootstrap() { var electronVersion = require('../package.json').electronVersion; moduleInstallEnv.npm_config_target = electronVersion; - // Atom on Windows is always 32-bit currently. + // Force 32-bit modules on Windows. + // /cc https://github.com/atom/atom/issues/10450 if (process.platform === 'win32') { moduleInstallEnv.npm_config_target_arch = 'ia32'; }