Actually compiler-rt is not even used in these new rustc versions

diff --git a/debian/changelog b/debian/changelog
index a559e506305a7bf049c792209e9871c0c32dd78e..0a0593f7d6e085619afe70f1ac526a0c82456904 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ rustc (1.37.0+dfsg1-1~exp2) UNRELEASED; urgency=medium
   * Support cross-compiling to wasm32. (Closes: #903110)
     To do that, install the libstd-rust-dev-wasm32-cross package and give
     --target wasm32-unknown-unknown.
+  * Drop dependency on system compiler-rt, these new versions of rustc
+    actually don't need it at all.
 
  -- Ximin Luo <infinity0@debian.org>  Thu, 29 Aug 2019 00:13:26 -0700
 

diff --git a/debian/control b/debian/control
index 16788fe8e4cbddd540222285716fdf095a23ea6e..17f8be2958eab344e169a962d1b1559c962f8948 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -14,8 +14,6 @@ Build-Depends: debhelper (>= 9),
                rustc:native (<= 1.37.0++)    <!pkg.rustc.dlstage0>,
                llvm-8-dev:native,
                llvm-8-tools:native,
-               libclang-common-8-dev:native,
-               libclang-common-8-dev,
                libllvm8,
                autotools-dev,
                cmake (>= 3.0) | cmake3,

diff --git a/debian/patches/series b/debian/patches/series
index 7ae9471829dc88ece458069c9aae3b990ca47922..dfe3eb3fe02f2eca6294b04eadbaca9496d61f27 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,7 +6,7 @@ u-reproducible-build.patch
 u-prefer-local-css.patch
 u-make-tests-work-without-rpath.patch
 u-mips-fixes.diff
-u-allow-system-compiler-rt.patch
+#u-allow-system-compiler-rt.patch
 
 # not forwarded, or forwarded but unlikely to be merged
 u-reproducible-dl-stage0.patch
@@ -19,7 +19,7 @@ d-0002-pkg-config-no-special-snowflake.patch
 d-0003-mdbook-strip-embedded-libs.patch
 d-0004-mdbook-2-1-compat.patch
 # Other patches needed by the full Debian build
-d-use-system-compiler-rt.patch
+#d-use-system-compiler-rt.patch
 d-ignore-error-detail-diff.patch
 d-disable-cargo-vendor.patch
 d-rust-gdb-paths