Merge pull request #2915 from atom/ks-32-bit-node-on-windows

Ship 32-bit node with apm on Windows
This commit is contained in:
Kevin Sawicki
2014-07-10 17:40:50 -07:00
2 changed files with 6 additions and 1 deletions

View File

@@ -6,6 +6,6 @@
"url": "https://github.com/atom/atom.git"
},
"dependencies": {
"atom-package-manager": "0.75.0"
"atom-package-manager": "0.76.0"
}
}

View File

@@ -57,6 +57,11 @@ function bootstrap() {
apmInstallOptions.ignoreStdout = true;
}
// apm ships with 32-bit node so make sure its native modules are compiled
// for a 32-bit target architecture
if (process.env.JANKY_SHA1 && process.platform === 'win32')
apmInstallCommand += ' --arch=ia32';
var commands = [
{
command: buildInstallCommand,