Bug 1100925 - Mach now detects msys2. r?gps draft
authorNathan Hakkakzadeh <nhakkakzadeh@mozilla.com>
Tue, 31 May 2016 14:44:53 -0700
changeset 387328 832ae1dbf456569125998beda974f9873245f69f
parent 387298 412755b088952351ae0bb40384ec409367077f38
child 387329 a4a33d2c6f405bbefcf2f0416da0c94f2c788933
push id22942
push userbmo:nhakkakzadeh@mozilla.com
push dateWed, 13 Jul 2016 21:21:35 +0000
reviewersgps
bugs1100925
milestone50.0a1
Bug 1100925 - Mach now detects msys2. r?gps Before, mach would only detect MINGW32 (used with msys). Now it also detects MINGW64 (used with msys2). MozReview-Commit-ID: 6IrNNmkLKgB
python/mach/mach/mixin/process.py
--- a/python/mach/mach/mixin/process.py
+++ b/python/mach/mach/mixin/process.py
@@ -25,17 +25,17 @@ elif 'MOZILLABUILD' in os.environ:
     _current_shell = os.environ['MOZILLABUILD'] + '/msys/bin/sh.exe'
 elif 'COMSPEC' in os.environ:
     _current_shell = os.environ['COMSPEC']
 else:
     raise Exception('Could not detect environment shell!')
 
 _in_msys = False
 
-if os.environ.get('MSYSTEM', None) == 'MINGW32':
+if os.environ.get('MSYSTEM', None) in ('MINGW32', 'MINGW64'):
     _in_msys = True
 
     if not _current_shell.lower().endswith('.exe'):
         _current_shell += '.exe'
 
 
 class ProcessExecutionMixin(LoggingMixin):
     """Mix-in that provides process execution functionality."""