diff options
| author | evanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-01 19:36:56 +0000 |
|---|---|---|
| committer | evanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-01 19:36:56 +0000 |
| commit | 2d453ef58dedee5245980bc2d82c34e6cc346705 (patch) | |
| tree | e01558d18121aedede4408cabddffded83866dc4 /build | |
| parent | 5aa609c52f85584aaf12786dcdffed36059b401f (diff) | |
| download | chromium_src-2d453ef58dedee5245980bc2d82c34e6cc346705.zip chromium_src-2d453ef58dedee5245980bc2d82c34e6cc346705.tar.gz chromium_src-2d453ef58dedee5245980bc2d82c34e6cc346705.tar.bz2 | |
Remove the cpu-count forwarding passing code from the v8 SConscript.
Running with n CPUs would cause our parent scons to run with n cpus
and then have it spawn a sub-scons that would itself attempt to run
with an additional n cpus.
Review URL: http://codereview.chromium.org/13010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6152 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/SConscript.v8 | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/build/SConscript.v8 b/build/SConscript.v8 index 67f17c4..c22fb57 100644 --- a/build/SConscript.v8 +++ b/build/SConscript.v8 @@ -9,13 +9,6 @@ Import('env') if not env.Dir('$CHROME_SRC_DIR/v8').exists(): Return() -# Grab the -j flag from the outer environment, if available. -try: - cpus = env.GetOption('num_jobs') - cpu_flag = ' -j%d' % cpus -except AttributeError: - cpu_flag = '' - # The v8 build script wants a 'debug'/'release' string to tell it whether # to build optimized. Convert our build flags into that form. mode = 'release' @@ -26,12 +19,12 @@ env = env.Clone( V8_MODE = mode, V8_MODE_DIR = '$V8_DIR/obj/$V8_MODE', V8_SCONS_COM = '$PYTHON $SCONS $SCONSFLAGS mode=$V8_MODE', - SCONS='$CHROME_SRC_DIR/third_party/scons/scons.py', + SCONS = '$CHROME_SRC_DIR/third_party/scons/scons.py', SCONSFLAGS = ('-Q ' '-C $OBJ_ROOT/v8 ' '-Y $CHROME_SRC_DIR/v8 ' '--warn=no-deprecated ' - '--warn=no-no-parallel-support' + cpu_flag), + '--warn=no-no-parallel-support'), ) # Rather than build v8 with our own commands, we just shell out to v8's |