summaryrefslogtreecommitdiffstats
path: root/build/moz.configure/rust.configure
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-15 03:35:49 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-15 03:35:49 +0000
commitd8bbc7858622b6d9c278469aab701ca0b609cddf (patch)
treeeff41dc61d9f714852212739e6b3738b82a2af87 /build/moz.configure/rust.configure
parentReleasing progress-linux version 125.0.3-1~progress7.99u1. (diff)
downloadfirefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.tar.xz
firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.zip
Merging upstream version 126.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'build/moz.configure/rust.configure')
-rw-r--r--build/moz.configure/rust.configure7
1 files changed, 2 insertions, 5 deletions
diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure
index 7a2fd1ae70..acac34ec05 100644
--- a/build/moz.configure/rust.configure
+++ b/build/moz.configure/rust.configure
@@ -766,17 +766,14 @@ def cargo_incremental(
set_config("CARGO_INCREMENTAL", cargo_incremental)
-@depends(rust_compile_flags, "--enable-warnings-as-errors", rustc_info)
-def rust_flags(compile_flags, warnings_as_errors, rustc_info):
+@depends(rust_compile_flags, "--enable-warnings-as-errors")
+def rust_flags(compile_flags, warnings_as_errors):
warning_flags = []
# Note that cargo passes --cap-lints warn to rustc for third-party code, so
# we don't need a very complicated setup.
if warnings_as_errors:
warning_flags.append("-Dwarnings")
- # Work around https://github.com/rust-lang/rust/issues/84428
- if rustc_info.version >= "1.52":
- warning_flags.append("-Aproc-macro-back-compat")
else:
warning_flags.extend(("--cap-lints", "warn"))