Commit 71459c91 authored by rakuco@webkit.org's avatar rakuco@webkit.org
Browse files

[jhbuild] Correctly specify an alternate number of make jobs.

https://bugs.webkit.org/show_bug.cgi?id=113396

Reviewed by Philippe Normand.

So far, we were using the `MAKEFLAGS' environment variable to pass the
number of compilation jobs we wanted to jhbuild. jhbuild itself, on the
other hand, prefers to use the `jobs' variable from jhbuildrc for that.

We now behave more closely to the rest of the WebKit tools by first
checking the `NUMBER_OF_PROCESSORS' environment variable and, if it is
not set, just letting jhbuild itself figure out how many jobs to use.

* efl/jhbuildrc:
* gtk/jhbuildrc:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146979 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 5a3d20f5
2013-03-27 Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
[jhbuild] Correctly specify an alternate number of make jobs.
https://bugs.webkit.org/show_bug.cgi?id=113396
Reviewed by Philippe Normand.
So far, we were using the `MAKEFLAGS' environment variable to pass the
number of compilation jobs we wanted to jhbuild. jhbuild itself, on the
other hand, prefers to use the `jobs' variable from jhbuildrc for that.
We now behave more closely to the rest of the WebKit tools by first
checking the `NUMBER_OF_PROCESSORS' environment variable and, if it is
not set, just letting jhbuild itself figure out how many jobs to use.
* efl/jhbuildrc:
* gtk/jhbuildrc:
2013-03-27 Zeno Albisser <zeno@webkit.org>
 
[Qt] Remove Qt specific WorkQueueItem definitions.
......@@ -47,8 +47,9 @@ else:
nonotify = True
notrayicon = True
if 'MAKEFLAGS' not in os.environ:
os.environ['MAKEFLAGS'] = '-j%d' % multiprocessing.cpu_count()
if 'NUMBER_OF_PROCESSORS' in os.environ:
jobs = os.environ['NUMBER_OF_PROCESSORS']
# Use system libraries while building.
if use_lib64:
......
......@@ -44,7 +44,9 @@ else:
nonotify = True
notrayicon = True
os.environ['MAKEFLAGS'] = '-j%d' % multiprocessing.cpu_count()
if 'NUMBER_OF_PROCESSORS' in os.environ:
jobs = os.environ['NUMBER_OF_PROCESSORS']
# GTK+ 3.0.12 misses the -lm flag when linking the tests.
module_makeargs['gtk+'] = 'LDFLAGS="-lm" ' + makeargs
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment