summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Andrews <athenian200@outlook.com>2021-11-29 23:42:20 -0600
committerMoonchild <moonchild@palemoon.org>2022-04-06 23:51:45 +0200
commita7bb2962936592a477c63dffb990c99efbdbcf17 (patch)
treeaa13cb9da4d4ccf4d3a6f41f289ee6837ec1cbad
parent7da587d0aaa6cfbb53fbfd9af55ba8c27ce8f385 (diff)
downloaduxp-a7bb2962936592a477c63dffb990c99efbdbcf17.tar.gz
Issue #1824 - Use Bash to check if config.status is up-to-date on SunOS.
The Python script here claims it can handle any Bourne-compatible shell, but the detection logic here really only works with GNU Bash. Not that there are that many Bourne-compatible shell implementations to compare against...
-rw-r--r--python/mozbuild/mozbuild/mozconfig.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/python/mozbuild/mozbuild/mozconfig.py b/python/mozbuild/mozbuild/mozconfig.py
index 71267c1be3..b2d91561e8 100644
--- a/python/mozbuild/mozbuild/mozconfig.py
+++ b/python/mozbuild/mozbuild/mozconfig.py
@@ -233,6 +233,11 @@ class MozconfigLoader(object):
shell = os.environ['MOZILLABUILD'] + '/msys/bin/sh'
if sys.platform == 'win32':
shell = shell + '.exe'
+ # /bin/sh is ksh on SunOS. The Python logic that detects whether
+ # config.status has changed expects GNU Bash, and does not seem to
+ # work with just any Bourne-compatible sh. So invoke bash directly.
+ if sys.platform in ('solaris','sunos5'):
+ shell = 'bash'
command = [shell, mozpath.normsep(self._loader_script),
mozpath.normsep(self.topsrcdir), path, sys.executable,