Permalink
Browse files

build: allow for the `make` command to be overwritten with --make=gma…

…ke or MAKE=gmake
  • Loading branch information...
1 parent 05f4ded commit 981bc5466670ca41c3f6e33c658a6b75a09617c1 @TooTallNate TooTallNate committed Jul 4, 2012
Showing with 11 additions and 9 deletions.
  1. +2 −1 lib/build.js
  2. +9 −8 lib/node-gyp.js
View
@@ -18,7 +18,8 @@ exports.usage = 'Invokes `' + (win ? 'msbuild' : 'make') + '` and builds the mod
function build (gyp, argv, callback) {
- var makeCommand = process.platform.indexOf('bsd') != -1 ? 'gmake' : 'make'
+ var makeCommand = gyp.opts.make || process.env.MAKE
+ || (process.platform.indexOf('bsd') != -1 ? 'gmake' : 'make')
var command = win ? 'msbuild' : makeCommand
, buildDir = path.resolve('build')
, configPath = path.resolve(buildDir, 'config.gypi')
View
@@ -72,16 +72,17 @@ proto.package = require('../package')
*/
proto.configDefs = {
- help: Boolean // everywhere
- , arch: String // 'configure'
- , debug: Boolean // 'build'
+ help: Boolean // everywhere
+ , arch: String // 'configure'
+ , debug: Boolean // 'build'
, directory: String // bin
+ , make: String // 'build'
, msvs_version: String // 'configure'
- , ensure: Boolean // 'install'
- , solution: String // 'build' (windows only)
- , proxy: String // 'install'
- , nodedir: String // 'configure'
- , loglevel: String // everywhere
+ , ensure: Boolean // 'install'
+ , solution: String // 'build' (windows only)
+ , proxy: String // 'install'
+ , nodedir: String // 'configure'
+ , loglevel: String // everywhere
}
/**

0 comments on commit 981bc54

Please sign in to comment.