summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorsgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-07 19:32:43 +0000
committersgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-07 19:32:43 +0000
commitfe1cf28eda7c4d2219e7bb396079a9941fd6edfd (patch)
treed91c37bff57e22700d801beb674d195fa41fd052 /build
parenta0889edfabc7e231af01f6044f0d2d6c684c1493 (diff)
downloadchromium_src-fe1cf28eda7c4d2219e7bb396079a9941fd6edfd.zip
chromium_src-fe1cf28eda7c4d2219e7bb396079a9941fd6edfd.tar.gz
chromium_src-fe1cf28eda7c4d2219e7bb396079a9941fd6edfd.tar.bz2
Set cpus=1 on systems where we don't (yet) know how to deduce
the number of CPUs. This at least allows the build to function on unknown systems. Remove a now-unnecessary addition of $V8_DIR to LIBPATH. The v8 libraries now get installed in $LIBS_DIR like everyone else. Review URL: http://codereview.chromium.org/10208 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5007 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/SConscript.main4
1 files changed, 2 insertions, 2 deletions
diff --git a/build/SConscript.main b/build/SConscript.main
index 0bb1d32..d1c8693 100644
--- a/build/SConscript.main
+++ b/build/SConscript.main
@@ -95,8 +95,6 @@ root_env = Environment(
'__env__, RDirs, TARGET, SOURCE)}'),
)
-root_env.Append(LIBPATH = ['$V8_DIR'])
-
# Declare a bit to gate solution generation.
# The actual generation must be at the end.
@@ -135,6 +133,8 @@ elif root_env['PLATFORM'] in ['linux', 'linux2', 'posix']:
# TODO(evanm): this is Linux-specific, not posix.
# Parse /proc/cpuinfo for processor count.
cpus = len([l for l in open('/proc/cpuinfo') if l.startswith('processor\t')])
+else:
+ cpus = 1
SetOption('num_jobs', cpus + 1)