Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 05:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #18677 - mbrubeck:mach, r=jdm

Browse source 
mach: Don't overwrite RUSTFLAGS when enabling debug assertions

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- 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/18677)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-09-29 13:51:41 -05:00 • committed by GitHub
commit 05f53d20e6
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
python/servo/build_commands.py
View file

@ -243,7 +243,7 @@ class MachCommands(CommandBase):
env = self.build_env(target=target, is_build=True) env = self.build_env(target=target, is_build=True)
if with_debug_assertions: if with_debug_assertions:
env["RUSTFLAGS"] = "-C debug_assertions" env['RUSTFLAGS'] = env.get('RUSTFLAGS', "") + " -C debug_assertions"
if android: if android:
android_platform = self.config["android"]["platform"] android_platform = self.config["android"]["platform"]