summaryrefslogtreecommitdiffstats
path: root/debian/patches/d-bootstrap-cargo-check-cfg.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-17 12:03:05 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-17 12:03:05 +0000
commit217d9223a5aa75daf9f286fd1fc06dae379b5dbc (patch)
treeb43bedae234ad56894a82934ee57e3619f3374d5 /debian/patches/d-bootstrap-cargo-check-cfg.patch
parentAdding upstream version 1.64.0+dfsg1. (diff)
downloadrustc-217d9223a5aa75daf9f286fd1fc06dae379b5dbc.tar.xz
rustc-217d9223a5aa75daf9f286fd1fc06dae379b5dbc.zip
Adding debian version 1.64.0+dfsg1-1.debian/1.64.0+dfsg1-1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/d-bootstrap-cargo-check-cfg.patch')
-rw-r--r--debian/patches/d-bootstrap-cargo-check-cfg.patch19
1 files changed, 19 insertions, 0 deletions
diff --git a/debian/patches/d-bootstrap-cargo-check-cfg.patch b/debian/patches/d-bootstrap-cargo-check-cfg.patch
new file mode 100644
index 000000000..e15707199
--- /dev/null
+++ b/debian/patches/d-bootstrap-cargo-check-cfg.patch
@@ -0,0 +1,19 @@
+our cargo doesn't know about the 'output' part yet, this patch can be dropped
+with cargo >= 0.64
+
+diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
+index 0ab4824ac0a..76c476f449b 100644
+--- a/src/bootstrap/builder.rs
++++ b/src/bootstrap/builder.rs
+@@ -1480,9 +1480,9 @@ impl<'a> Builder<'a> {
+ // complete list of features, so for that reason we don't enable checking of
+ // features for std crates.
+ cargo.arg(if mode != Mode::Std {
+- "-Zcheck-cfg=names,values,output,features"
++ "-Zcheck-cfg=names,values,features"
+ } else {
+- "-Zcheck-cfg=names,values,output"
++ "-Zcheck-cfg=names,values"
+ });
+
+ // Add extra cfg not defined in/by rustc