diff options
author | isaacs <i@izs.me> | 2013-03-25 21:51:18 +0400 |
---|---|---|
committer | isaacs <i@izs.me> | 2013-03-25 21:51:18 +0400 |
commit | 1cdedb25ccaf979d28f36c997c34820a85930f80 (patch) | |
tree | 48ea594c3619044670edbdf2f25a21b876a670e1 /node_modules/node-gyp/lib/configure.js | |
parent | c86fbc780c3a640ec2b58825e618454ad25c7ef5 (diff) |
node-gyp@0.9.2
Diffstat (limited to 'node_modules/node-gyp/lib/configure.js')
-rw-r--r-- | node_modules/node-gyp/lib/configure.js | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/node_modules/node-gyp/lib/configure.js b/node_modules/node-gyp/lib/configure.js index e3200998f..437b839ca 100644 --- a/node_modules/node-gyp/lib/configure.js +++ b/node_modules/node-gyp/lib/configure.js @@ -14,7 +14,6 @@ var fs = require('graceful-fs') , semver = require('semver') , mkdirp = require('mkdirp') , cp = require('child_process') - , exec = cp.exec , spawn = cp.spawn , execFile = cp.execFile , win = process.platform == 'win32' @@ -91,7 +90,8 @@ function configure (gyp, argv, callback) { } function checkPythonVersion () { - execFile(python, ['-c', 'import platform; print(platform.python_version());'], function (err, stdout) { + var env = { TERM: 'dumb', PATH: process.env.PATH }; + execFile(python, ['-c', 'import platform; print(platform.python_version());'], { env: env }, function (err, stdout) { if (err) { return callback(err) } @@ -166,11 +166,7 @@ function configure (gyp, argv, callback) { var cp = spawn('cmd', ['/C', '%WINDIR%\\SysWOW64\\reg', 'query', 'HKLM\\Software\\Microsoft\\VCExpress\\10.0\\Setup\\VC', '/v', 'ProductDir']) cp.on('exit', function (code) { hasVCExpress = (code === 0) - if (code !== 0) { - checkVC2012Express(cb) - } else { - cb() - } + checkVC2012Express(cb) }) } @@ -180,7 +176,7 @@ function configure (gyp, argv, callback) { if (code !== 0) { checkVCExpress64(cb) } else { - cb() + checkVC2012Express(cb) } }) } @@ -291,6 +287,9 @@ function configure (gyp, argv, callback) { // don't copy dev libraries with nodedir option variables.copy_dev_lib = !gyp.opts.nodedir + // disable -T "thin" static archives by default + variables.standalone_static_library = gyp.opts.thin ? 0 : 1; + // loop through the rest of the opts and add the unknown ones as variables. // this allows for module-specific configure flags like: // |