Bug 1100925 - Added mingw32-make to the list of possible makes. r?gps draft
authorNathan Hakkakzadeh <nhakkakzadeh@mozilla.com>
Tue, 31 May 2016 15:47:37 -0700
changeset 387329 a4a33d2c6f405bbefcf2f0416da0c94f2c788933
parent 387328 832ae1dbf456569125998beda974f9873245f69f
child 387330 703c049429ef1e39875974f5a262496590ec2c5b
push id22942
push userbmo:nhakkakzadeh@mozilla.com
push dateWed, 13 Jul 2016 21:21:35 +0000
reviewersgps
bugs1100925
milestone50.0a1
Bug 1100925 - Added mingw32-make to the list of possible makes. r?gps Technically, this includes the mingw64 version of make, but it is still called mingw32-make when installed from pacman with msys2. This is a necessary step to make Firefox build on a pure msys2 environment. Also, unlike mozmake, because this make is installed from a package manager. It can be automatically updated. MozReview-Commit-ID: EAN6xmIgYWd
python/mozbuild/mozbuild/base.py
--- a/python/mozbuild/mozbuild/base.py
+++ b/python/mozbuild/mozbuild/base.py
@@ -615,17 +615,17 @@ class MozbuildObject(ProcessExecutionMix
                 try:
                     subprocess.check_output(cmd, stderr=subprocess.STDOUT)
                 except subprocess.CalledProcessError as e:
                     return False, is_xcode_lisense_error(e.output)
                 return True, False
             return False, False
 
         xcode_lisense_error = False
-        possible_makes = ['gmake', 'make', 'mozmake', 'gnumake']
+        possible_makes = ['gmake', 'make', 'mozmake', 'gnumake', 'mingw32-make']
 
         if 'MAKE' in os.environ:
             make = os.environ['MAKE']
             possible_makes.insert(0, make)
 
         for test in possible_makes:
             if os.path.isabs(test):
                 make = test