Skip to content

Commit 2ca2dfc

Browse files
committed
Set the default RUSTFLAGS to allow mismatched_lifetime_syntaxes
Signed-off-by: webbeef <[email protected]>
1 parent 3043fb5 commit 2ca2dfc

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

python/servo/build_commands.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ def build_sanitizer_env(
255255
# The actual flags will be appended below depending on the sanitizer kind.
256256
env.setdefault("TARGET_CFLAGS", "")
257257
env.setdefault("TARGET_CXXFLAGS", "")
258-
env.setdefault("RUSTFLAGS", "")
258+
env.setdefault("RUSTFLAGS", "-A mismatched_lifetime_syntaxes")
259259

260260
if sanitizer.is_asan():
261261
if target_triple not in SUPPORTED_ASAN_TARGETS:

python/servo/command_base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ def build_env(self) -> dict[str, str]:
497497
elif self.config["build"]["incremental"] is not None:
498498
env["CARGO_INCREMENTAL"] = "0"
499499

500-
env["RUSTFLAGS"] = env.get("RUSTFLAGS", "")
500+
env["RUSTFLAGS"] = env.get("RUSTFLAGS", "-A mismatched_lifetime_syntaxes")
501501

502502
if self.config["build"]["rustflags"]:
503503
env["RUSTFLAGS"] += " " + self.config["build"]["rustflags"]

python/servo/platform/build_target.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ def to_ndk_bin(prog: str) -> str:
215215
capture_output=True,
216216
encoding="utf8",
217217
).stdout
218-
env["RUSTFLAGS"] = env.get("RUSTFLAGS", "")
218+
env["RUSTFLAGS"] = env.get("RUSTFLAGS", "-A mismatched_lifetime_syntaxes")
219219
env["RUSTFLAGS"] += f"-C link-arg={libclangrt_filename}"
220220

221221
assert host_cc

0 commit comments

Comments
 (0)