diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-01-26 15:35:59 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-26 15:35:59 -0500 |
commit | d44e9aced206cfcc74fb89dd1a7e43bbdada8d68 (patch) | |
tree | 5ba605ec4f09a45b10dcfc2dc59c88384fb120d0 /python | |
parent | 0e99ddd6fdf1d66c8912eb0e9ef69f09f234ab52 (diff) | |
parent | b55c9cf98b04b623305e45b4049aad4be1e879e6 (diff) | |
download | servo-d44e9aced206cfcc74fb89dd1a7e43bbdada8d68.tar.gz servo-d44e9aced206cfcc74fb89dd1a7e43bbdada8d68.zip |
Auto merge of #22745 - asajeffrey:magicleap-xor-debugmozjs, r=jdm
Stop building debugmozjs for magicleap
<!-- Please describe your changes on the following line: -->
Block trying to build `--debug-mozjs` and `--magicleap` because that leads to horrid link errors.
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes do not require tests because we don't test our CI as much as we probably should
<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
<!-- 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/22745)
<!-- Reviewable:end -->
Diffstat (limited to 'python')
-rw-r--r-- | python/servo/build_commands.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 2e6979d0fca..a3a463d5931 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -211,6 +211,11 @@ class MachCommands(CommandBase): print("Please specify either --target or --android.") sys.exit(1) + # https://github.com/servo/servo/issues/22069 + if debug_mozjs and magicleap: + print("Please specify either --debug-mozjs or --magicleap.") + sys.exit(1) + if android: target = self.config["android"]["target"] |