From 311a62dea7478f75cf5a9fc725c8b3d6869faaae Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Wed, 26 May 2010 20:05:31 +0000 Subject: [PATCH] Fix JOBS for Solaris make --- Makefile | 4 ++-- wscript | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d68eeced1db..3547b43e78f 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ -JOBS?=1 # The number of parallel processes. Use 'JOBS=2 make' for more. -WAF=python tools/waf-light --jobs=$(JOBS) +WAF=python tools/waf-light all: + echo $(WAF) @$(WAF) build all-debug: diff --git a/wscript b/wscript index 7eb05cc5c79..ff6f00fc950 100644 --- a/wscript +++ b/wscript @@ -15,6 +15,11 @@ import js2c srcdir = '.' blddir = 'build' + +jobs=1 +if os.environ.has_key('JOBS'): + jobs = int(os.environ['JOBS']) + def set_options(opt): # the gcc module provides a --debug-level option opt.tool_options('compiler_cxx') @@ -232,6 +237,7 @@ def build_v8(bld): bld.install_files('${PREFIX}/include/node/', 'deps/v8/include/*.h') def build(bld): + Options.options.jobs=jobs print "DEST_OS: " + bld.env['DEST_OS'] print "DEST_CPU: " + bld.env['DEST_CPU'] print "Parallel Jobs: " + str(Options.options.jobs)