github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-23 22:08:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10468 from atom/fix-64-bit-windows

Browse Source 
Fix 64-bit Windows builds
This commit is contained in:
Josh Abernathy
2016-01-18 22:20:58 -05:00
parent 04b100fab8 032a734325
commit 48eb5ab774
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
script/bootstrap
View File

@@ -89,6 +89,12 @@ function bootstrap() {
// proper binaries.
var electronVersion = require('../package.json').electronVersion;
moduleInstallEnv.npm_config_target = electronVersion;
// Force 32-bit modules on Windows.
// /cc https://github.com/atom/atom/issues/10450
if (process.platform === 'win32') {
moduleInstallEnv.npm_config_target_arch = 'ia32';
}
var moduleInstallOptions = {env: moduleInstallEnv};
if (process.argv.indexOf('--no-quiet') === -1) {
@@ -102,7 +108,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 = [