summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2020-03-13 13:00:12 -0400
committerMatt A. Tobin <email@mattatobin.com>2020-03-13 13:00:12 -0400
commit157a4abbcca108b050d359364f025e314d7fe315 (patch)
tree09b5680938b3f05580c86fc21a998eed8354a8c4
parent41e5925b4271c598601fdc77238bbf6497576594 (diff)
downloadUXP-157a4abbcca108b050d359364f025e314d7fe315.tar
UXP-157a4abbcca108b050d359364f025e314d7fe315.tar.gz
UXP-157a4abbcca108b050d359364f025e314d7fe315.tar.lz
UXP-157a4abbcca108b050d359364f025e314d7fe315.tar.xz
UXP-157a4abbcca108b050d359364f025e314d7fe315.zip
Issue #1477 - Fix finding config.guess on builds not using MOZ_OBJDIR
* So far this seems to only affect Macintosh builds but other unix builds may be affected. Windows doesn't seem to be. * This maintains consistency with other one-off file invocations and backwards compatibility with older comm setups
-rw-r--r--python/mozbuild/mozbuild/base.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/python/mozbuild/mozbuild/base.py b/python/mozbuild/mozbuild/base.py
index 9d5897a34..9db1005d1 100644
--- a/python/mozbuild/mozbuild/base.py
+++ b/python/mozbuild/mozbuild/base.py
@@ -352,6 +352,13 @@ class MozbuildObject(ProcessExecutionMixin):
return _config_guess_output[0]
p = os.path.join(self.topsrcdir, 'build', 'autoconf', 'config.guess')
+
+ # Try looking for mozilla, for comm-central
+ if not os.path.isfile(p):
+ p = os.path.join(self.topsrcdir, 'mozilla', 'build', 'autoconf', 'config.guess')
+
+ if not os.path.isfile(p):
+ p = os.path.join(self.topsrcdir, 'platform', 'build', 'autoconf', 'config.guess')
# This is a little kludgy. We need access to the normalize_command
# function. However, that's a method of a mach mixin, so we need a