Changeset 112153 in webkit

Timestamp:

Mar 26, 2012 3:14:38 PM (12 years ago)

Author:

kubo@profusion.mobi

Message:

[jhbuild] Use $MAKE if it is defined to build jhbuild itself.
​https://bugs.webkit.org/show_bug.cgi?id=82209

Reviewed by Martin Robinson.

Respecting the $MAKE environment variable when it is defined makes
building jhbuild more portable, as some platforms may have GNU
make as gmake, for example.

• jhbuild/jhbuild-wrapper:

(install_jhbuild):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• jhbuild/jhbuild-wrapper (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-03-26  Raphael Kubo da Costa  <rakuco@FreeBSD.org>
+
+        [jhbuild] Use $MAKE if it is defined to build jhbuild itself.
+        https://bugs.webkit.org/show_bug.cgi?id=82209
+
+        Reviewed by Martin Robinson.
+
+        Respecting the $MAKE environment variable when it is defined makes
+        building jhbuild more portable, as some platforms may have GNU
+        make as gmake, for example.
+
+        * jhbuild/jhbuild-wrapper:
+        (install_jhbuild):
+
 2012-03-26  Dirk Pranke  <dpranke@chromium.org>
 

trunk/Tools/jhbuild/jhbuild-wrapper

@@ -19 +19 @@
 
 import os
+import shlex
 import subprocess
 import sys
@@ -91 +92 @@
         raise Exception('jhbuild configure failed with return code: %i' % process.returncode)
 
-    process = subprocess.Popen(['make', 'install'], cwd=jhbuild_source_path)
+    # This is a hackish approach to make the subprocess.Popen call even when people set
+    # MAKE to 'make -j3' instead of using the MAKEFLAGS environment variable.
+    make = shlex.split(os.environ.get('MAKE', 'make'))
+
+    process = subprocess.Popen(make + ['install'], cwd=jhbuild_source_path)
     process.wait()
     if process.returncode != 0: