Merge tag 'debian/1.50.0+dfsg1-1_exp4' into debian/sid

[rustc.git] / debian / patches / d-fix-mips64el-bootstrap.patch

diff --git a/debian/patches/d-fix-mips64el-bootstrap.patch b/debian/patches/d-fix-mips64el-bootstrap.patch
index f879ae13c047072f2e41b3f130a754ba490e1807..4d2bcacebbb38ec1b67e3179bcabbfa9411a8413 100644 (file)
--- a/debian/patches/d-fix-mips64el-bootstrap.patch
+++ b/debian/patches/d-fix-mips64el-bootstrap.patch
@@ -1,14 +1,14 @@
 Bug: https://github.com/rust-lang/rust/issues/52108
 --- a/src/bootstrap/bootstrap.py
 +++ b/src/bootstrap/bootstrap.py
-@@ -791,6 +791,8 @@
+@@ -795,6 +795,8 @@
          # preserve existing RUSTFLAGS
          env.setdefault("RUSTFLAGS", "")
          env["RUSTFLAGS"] += " -Cdebuginfo=2"
 +        if self.build_triple().startswith('mips'):
 +            env["RUSTFLAGS"] += " -Ctarget-feature=+xgot"
  
-         build_section = "target.{}".format(self.build_triple())
+         build_section = "target.{}".format(self.build)
          target_features = []
 --- a/compiler/rustc_target/src/spec/mips64_unknown_linux_gnuabi64.rs
 +++ b/compiler/rustc_target/src/spec/mips64_unknown_linux_gnuabi64.rs