aboutsummaryrefslogtreecommitdiffstats
path: root/python/servo
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-10-05 09:57:06 -0500
committerGitHub <noreply@github.com>2016-10-05 09:57:06 -0500
commit9c2610146ae3a61e1da917a9fd5e3902bd267d4a (patch)
treed0b5fbdef425c2f96f749bb5a6701eddee9a8056 /python/servo
parent8a3af9d1b9fe55a802d6463f6e4a5dbf39a1ecff (diff)
parente16c7ec861e75a541972cb9c72b067f1badcdf9d (diff)
downloadservo-9c2610146ae3a61e1da917a9fd5e3902bd267d4a.tar.gz
servo-9c2610146ae3a61e1da917a9fd5e3902bd267d4a.zip
Auto merge of #13601 - larsbergstrom:debug_assertions_cef, r=nox
Ensure that SERVO_ENABLE_DEBUG_ASSERTIONS is also used in build-cef r? @nox Fixes #13591 This fixes the problem with rebuilding all of CEF on the linux-rel builders by ensuring it gets the same `RUSTFLAGS`. Proof: ``` [larsberg@larsberg servo2]$ ./mach build-cef -r Compiling embedding v0.0.1 (file:///Users/larsberg/servo2/ports/cef) Finished release [optimized] target(s) in 35.42 secs [Warning] Could not generate notification! Optional Python module 'pyobjc' is not installed. CEF build completed in 0:00:38 [larsberg@larsberg servo2]$ ``` <!-- 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/13601) <!-- Reviewable:end -->
Diffstat (limited to 'python/servo')
-rw-r--r--python/servo/build_commands.py11
1 files changed, 10 insertions, 1 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py
index 2e2051b44d5..47dad148ddb 100644
--- a/python/servo/build_commands.py
+++ b/python/servo/build_commands.py
@@ -324,9 +324,18 @@ class MachCommands(CommandBase):
opts += ["--features", "%s" % ' '.join("servo/" + x for x in servo_features)]
build_start = time()
+ env = self.build_env(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"
+
with cd(path.join("ports", "cef")):
ret = call(["cargo", "build"] + opts,
- env=self.build_env(is_build=True), verbose=verbose)
+ env=env,
+ verbose=verbose)
elapsed = time() - build_start
# Generate Desktop Notification if elapsed-time > some threshold value