Auto merge of #13387 - emilio:debug-assertions, r=aneeshusa,jdm,pcwalton

Honor SERVO_ENABLE_DEBUG_ASSERTIONS on the build machines.

<!-- Please describe your changes on the following line: -->

As part of #13127.

cc @aneeshusa

---
<!-- 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

<!-- 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/13387)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-10-04 14:01:49 -05:00 committed by GitHub
commit 19a5a30113
6 changed files with 52 additions and 16 deletions

View file

@ -216,6 +216,12 @@ class MachCommands(CommandBase):
build_start = time()
env = self.build_env(target=target, is_build=True)
# TODO: If this ends up making it, we should probably add a
# --release-with-debug-assertions option or similar, so it's easier to
# build locally.
if env.get("SERVO_ENABLE_DEBUG_ASSERTIONS", None):
env["RUSTFLAGS"] = "-C debug_assertions"
if android:
# Build OpenSSL for android
make_cmd = ["make"]