Merge tag '1.39.0+dfsg1-4' into bullseye-working

diff --cc debian/changelog
index 250036da4f463fc86c8c304829f9395839facc75,3e16acdcc6092cbcc6e8f24f7a4a1498aa1068a0..605c0fafc87deb0303b42e1f436c8d8e24277378
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,41 +1,52 @@@
- rustc (1.37.0+dfsg1-1+rpi1) bullseye-staging; urgency=medium
++rustc (1.39.0+dfsg1-4+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 1.15.1+dfsg1-1~exp3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 15 Mar 2017 10:16:18 +0000]
 +  * Build for armv6.
 +  [changes introduced in 1.18.0+dfsg1-4+rpi1 by Peter Michael Green]
 +  * Disable testsuite.
 +  [changes introduced in 1.37.0+dfsg1-1+rpi1 by Peter Michael Green]
 +  * Set DEB_BUILD_RUST_TYPE based on the compiler that is actually installed.
 +
-  -- Peter Micheal Green <plugwash@raspbian.org>  Tue, 17 Sep 2019 01:17:52 +0000
++ -- Peter Micheal Green <plugwash@raspbian.org>  Sat, 28 Dec 2019 09:52:57 +0000
++
+ rustc (1.39.0+dfsg1-4) unstable; urgency=medium
+ 
+   * Update to LLVM 9. (Closes: #946886)
+ 
+  -- Ximin Luo <infinity0@debian.org>  Mon, 23 Dec 2019 03:21:02 +0000
+ 
+ rustc (1.39.0+dfsg1-3) unstable; urgency=medium
+ 
+   * Fix mips patch involving mxgot for new RUSTFLAGS behaviour.
+ 
+  -- Ximin Luo <infinity0@debian.org>  Fri, 06 Dec 2019 22:18:53 +0000
+ 
+ rustc (1.39.0+dfsg1-2) unstable; urgency=medium
+ 
+   * Include reproducibility patch for compiler-builtins.
+   * Use python3 instead of python to run rustbuild. (Closes: #938422)
+   * Expand d-ignore-error-detail-diff.patch for unfixed upstream #53081.
+ 
+  -- Ximin Luo <infinity0@debian.org>  Thu, 05 Dec 2019 22:51:41 +0000
+ 
+ rustc (1.39.0+dfsg1-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Ximin Luo <infinity0@debian.org>  Sat, 30 Nov 2019 22:20:48 +0000
+ 
+ rustc (1.38.0+dfsg1-2) unstable; urgency=medium
+ 
+   * Fix building with rustc 1.38.0
+   * Fix building with cargo 0.40.0
+ 
+  -- Ximin Luo <infinity0@debian.org>  Fri, 29 Nov 2019 00:05:16 +0000
+ 
+ rustc (1.38.0+dfsg1-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Ximin Luo <infinity0@debian.org>  Tue, 26 Nov 2019 14:41:46 +0000
  
  rustc (1.37.0+dfsg1-1) unstable; urgency=medium
  

diff --cc debian/rules
index 8b471bdb695762ad385360ba37cc012e7ac2e30c,3ee919deb15fd1abe53df4f8efc9a5e5f53b8bc5..26211e71a3f1891c99e88bf25fdb920d91eb06a3
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -233,10 -238,8 +238,8 @@@ override_dh_auto_test-arch
                test "$$(stat -c %s "$$x")" -lt 6000000; \
        done
  ifeq (, $(filter nocheck,$(DEB_BUILD_PROFILES)))
 -ifeq (, $(filter nocheck,$(DEB_BUILD_OPTIONS)))
 +ifeq (testsuitedisabled, $(filter nocheck,$(DEB_BUILD_OPTIONS)))
-       # TODO: eventually, drop --target $(DEB_HOST_RUST_TYPE) and run tests for
-       # all targets including e.g. wasm32-unknown-unknown
-       { $(RUSTBUILD_TEST) --no-fail-fast --target $(DEB_HOST_RUST_TYPE) $(RUSTBUILD_FLAGS) $(RUSTBUILD_TEST_FLAGS); echo $$?; } | tee -a $(TEST_LOG)
+       { $(RUSTBUILD_TEST) --no-fail-fast $(RUSTBUILD_FLAGS) $(RUSTBUILD_TEST_FLAGS); echo $$?; } | tee -a $(TEST_LOG)
        # test that the log has at least 1 pass, to prevent e.g. #57709
        grep -l "^test .* \.\.\. ok$$" $(TEST_LOG)
        echo "==== Debian rustc test report ===="; \