diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-04-18 06:10:46 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-18 06:10:46 -0500 |
commit | 7413c716fb954c1dd27c39929e27bd7b4b188720 (patch) | |
tree | 38ce0f2be745c2dec043d1c236e1e15e024a128a /resources/ahem | |
parent | 349ddb555a8be9daad691a201f72682a141e34e4 (diff) | |
parent | 0730888fbe26c133c3c9e8b013a46c2cd5e59a8c (diff) | |
download | servo-7413c716fb954c1dd27c39929e27bd7b4b188720.tar.gz servo-7413c716fb954c1dd27c39929e27bd7b4b188720.zip |
Auto merge of #16505 - aneeshusa:stop-mach-bootstrap-from-segfaulting, r=Wafflespeanut
Stop mach bootstrap from segfaulting
<!-- Please describe your changes on the following line: -->
See the commit message for details; the top-level import of Mako causes `./mach bootstrap` to segfault in glibc while exiting, seems to have to do with the native `_speedups.so` library of MarkupSafe, a Mako dependency.
Needed for servo/saltfs#631.
cc @emilio to make sure this is OK for stylo (e.g. #13171)
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [ ] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #12103 (github issue number if applicable).
<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because the test is part of servo/saltfs#631
<!-- 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/16505)
<!-- Reviewable:end -->
Diffstat (limited to 'resources/ahem')
0 files changed, 0 insertions, 0 deletions