summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2019-12-01 06:54:58 -0500
committerMatt A. Tobin <email@mattatobin.com>2019-12-01 06:54:58 -0500
commitc8d03b9fecb8124047d7fa179d34011c35ab4a39 (patch)
treeb49054b05963c437a857812a0867cda584a3fc22
parent2554b96d6936d83879fccd56d2bb460c21c07025 (diff)
downloadUXP-c8d03b9fecb8124047d7fa179d34011c35ab4a39.tar
UXP-c8d03b9fecb8124047d7fa179d34011c35ab4a39.tar.gz
UXP-c8d03b9fecb8124047d7fa179d34011c35ab4a39.tar.lz
UXP-c8d03b9fecb8124047d7fa179d34011c35ab4a39.tar.xz
UXP-c8d03b9fecb8124047d7fa179d34011c35ab4a39.zip
No Issue - Add checking in platform/ for clobber.py because it can only know hardcoded values in comm-style configurations
-rw-r--r--python/mozbuild/mozbuild/controller/clobber.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/python/mozbuild/mozbuild/controller/clobber.py b/python/mozbuild/mozbuild/controller/clobber.py
index d3cdfd596..ba83e2428 100644
--- a/python/mozbuild/mozbuild/controller/clobber.py
+++ b/python/mozbuild/mozbuild/controller/clobber.py
@@ -58,6 +58,9 @@ class Clobberer(object):
if not os.path.isfile(self.src_clobber):
self.src_clobber = os.path.join(topsrcdir, 'mozilla', 'CLOBBER')
+ if not os.path.isfile(self.src_clobber):
+ self.src_clobber = os.path.join(topsrcdir, 'platform', 'CLOBBER')
+
assert os.path.isfile(self.src_clobber)
def clobber_needed(self):