diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-05-06 21:25:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-06 21:25:59 -0400 |
| commit | 7e8e3fe4de66541ee8ad0f27dade08b39f6ea23a (patch) | |
| tree | b162eea76c66b7b208e6e65aead21d97cf9f38ee /python/mach_bootstrap.py | |
| parent | 64c848950c50b1946e5a3f69d66ca5aac5b9ce1a (diff) | |
| parent | 36da6dfe9835a87117b8e9ee9cf014ced900801f (diff) | |
| download | servo-7e8e3fe4de66541ee8ad0f27dade08b39f6ea23a.tar.gz servo-7e8e3fe4de66541ee8ad0f27dade08b39f6ea23a.zip | |
Auto merge of #23333 - Manishearth:mach-module, r=jdm
Explicitly provide module names to mach so it doesn't try to autogenerate them
This works around https://bugzilla.mozilla.org/show_bug.cgi?id=1549636
r? @jdm
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23333)
<!-- Reviewable:end -->
Diffstat (limited to 'python/mach_bootstrap.py')
| -rw-r--r-- | python/mach_bootstrap.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/python/mach_bootstrap.py b/python/mach_bootstrap.py index aded4c0a0e9..f94f2c6f772 100644 --- a/python/mach_bootstrap.py +++ b/python/mach_bootstrap.py @@ -293,6 +293,10 @@ def bootstrap(topdir): mach.define_category(category, meta['short'], meta['long'], meta['priority']) for path in MACH_MODULES: - mach.load_commands_from_file(os.path.join(topdir, path)) + # explicitly provide a module name + # workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=1549636 + file = os.path.basename(path) + module_name = os.path.splitext(file)[0] + mach.load_commands_from_file(os.path.join(topdir, path), module_name) return mach |