Merge remote-tracking branch 'origin/tracking' into custom

python/mach/mach/mixin/process.py

@@ -17,14 +17,16 @@ from .logging import LoggingMixin
 
 
 # Perform detection of operating system environment. This is used by command
-# execution. We only do this once to save redundancy. Yes, this can fail module
-# loading. That is arguably OK.
+# execution. We only do this once to save redundancy. Fall back to checking
+# existence of /bin/sh if environment detection fails.
 if 'SHELL' in os.environ:
     _current_shell = os.environ['SHELL']
 elif 'MOZILLABUILD' in os.environ:
     _current_shell = os.environ['MOZILLABUILD'] + '/msys/bin/sh.exe'
 elif 'COMSPEC' in os.environ:
     _current_shell = os.environ['COMSPEC']
+elif os.path.exists("/bin/sh"):
+    _current_shell = '/bin/sh'
 else:
     raise Exception('Could not detect environment shell!')
 

python/mozbuild/mozbuild/artifacts.py

@@ -818,6 +818,10 @@ class Artifacts(object):
             return ('linux64' if target_64bit else 'linux') + target_suffix
         if self._defines.get('XP_WIN', False):
             return ('win64' if target_64bit else 'win32') + target_suffix
+        if self._defines.get('XP_MACOSX', False):
+            # We only produce unified builds in automation, so the target_cpu
+            # check is not relevant.
+            return 'macosx64' + target_suffix
         raise Exception('Cannot determine default job for |mach artifact|!')
 
     def _pushheads_from_rev(self, rev, count):

python/psutil/psutil/_psutil_posix.c

@@ -23,6 +23,7 @@
 #include <netdb.h>
 #include <netinet/in.h>
 #include <net/if_dl.h>
+#include <sys/ioctl.h>
 #endif
 
 #if defined(__sun)