Temporary fix for mips64el bootstrap

diff --git a/debian/changelog b/debian/changelog
index 184a9b44ef6e3f3fb3bd2031069fe54339ce7627..cac8ae1b299289c2b317d0a161ed61c4467ff65b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ rustc (1.28.0+dfsg1-1~exp1) UNRELEASED; urgency=medium
   * Add patches from Fedora to fix some test failures.
   * Ignore a failure testing specific error output, under investigation.
   * Allow 100 test failures on s390x, should be reducible later with LLVM 7.
+  * Temporary fix for mips64el bootstrap.
 
  -- Ximin Luo <infinity0@debian.org>  Sat, 04 Aug 2018 22:47:24 -0700
 

diff --git a/debian/patches/d-fix-mips64el-bootstrap.patch b/debian/patches/d-fix-mips64el-bootstrap.patch
new file mode 100644 (file)
index 0000000..5bf4f84
--- /dev/null
+++ b/debian/patches/d-fix-mips64el-bootstrap.patch
@@ -0,0 +1,12 @@
+Bug: https://github.com/rust-lang/rust/issues/52108
+--- a/src/bootstrap/bootstrap.py
++++ b/src/bootstrap/bootstrap.py
+@@ -608,6 +608,8 @@
+             (os.pathsep + env["LIBRARY_PATH"]) \
+             if "LIBRARY_PATH" in env else ""
+         env["RUSTFLAGS"] = "-Cdebuginfo=2 "
++        if self.build_triple().startswith('mips'):
++            env["RUSTFLAGS"] += " -Cllvm-args=-mxgot"
+ 
+         build_section = "target.{}".format(self.build_triple())
+         target_features = []

diff --git a/debian/patches/series b/debian/patches/series
index d17efbc59f083af057903183e9276f6975216d91..b4dfd2cf70b5f89a58ead7a26db2dd7ac3736ce2 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -31,9 +31,10 @@ d-add-soname.patch
 d-dont-download-stage0.patch
 d-ignore-removed-submodules.patch
 d-armel-disable-kernel-helpers.patch
+d-read-beta-version-from-file.patch
 d-ignore-impl-generic-mismatch-diff.patch
-d-no-web-dependencies-in-doc.patch
+d-fix-mips64el-bootstrap.patch
 
+d-no-web-dependencies-in-doc.patch
 # Work around for some porterboxes, keep this commented
 #d-host-duplicates.patch
-d-read-beta-version-from-file.patch