rust: bump to 1.42.0

5 files changed, 26 insertions, 22 deletions

diff --git a/extra/rust/build b/extra/rust/build
index 1acbb91b..fa5c547c 100755
--- a/extra/rust/build
+++ b/extra/rust/build
@@ -6,7 +6,7 @@ patch -p1 < musl.patch
 # bootstrap library to allow for the removal of the internet
 # connection requirement per build.
 {
-    mkdir -p "${cache_dir:=build/cache/2019-12-19}"
+    mkdir -p "${cache_dir:=build/cache/2020-02-27}"
 
     for tarball in *.tar.xz\?no-extract; do
         mv -f "$tarball" "$cache_dir/${tarball%%\?no-extract}"
diff --git a/extra/rust/checksums b/extra/rust/checksums
index 7c22482f..47ac6e98 100644
--- a/extra/rust/checksums
+++ b/extra/rust/checksums
@@ -1,5 +1,5 @@
-ebac9861b43c7207af36e24402dfdc5463a4df4bdb015ccb2b165251c0fdcf7c  rustc-1.41.1-src.tar.xz
-c647bb7f399b3d18e345b2dab1fb073470582a9298e83d8648f6661544df7279  rust-std-1.40.0-x86_64-unknown-linux-musl.tar.xz?no-extract
-769b9e31557fcc0ea2a661f88b679d3dbd62b537807c7b3c75ac6816a1be4fa3  rustc-1.40.0-x86_64-unknown-linux-musl.tar.xz?no-extract
-848646326474392bdac70a5bfa06efda4c36e2bbbf088f07456f98c7575844e1  cargo-0.41.0-x86_64-unknown-linux-musl.tar.xz?no-extract
-bb6f561f1a6ddd15b32126a024f3b0a4f66555797c1ebd6d1d17b7d604a083ae  musl.patch
+aa5b4c0f2bac33cc26a11523fce9b0f120d2eff510ed148ae7c586501481ed04  rustc-1.42.0-src.tar.xz
+82b2ce7da86132beeab1a00e52c3a748d52206af4cdd82de6586b13e819ceba7  rust-std-1.41.1-x86_64-unknown-linux-musl.tar.xz?no-extract
+af9b1797ce5ae20bceabc3e5e67a9aca507bcfca3100d916783bd82273924d46  rustc-1.41.1-x86_64-unknown-linux-musl.tar.xz?no-extract
+4f36ad854709cfaa85bf98d05cb9ecbcc2ee3a2698af99bfff0e04cd941bea56  cargo-0.42.0-x86_64-unknown-linux-musl.tar.xz?no-extract
+abb2acdfc50880da504225dd068f5ea381997cac9ebd23f371290aa8f29d438f  musl.patch
diff --git a/extra/rust/patches/musl.patch b/extra/rust/patches/musl.patch
index 6cb1c83e..04c246ca 100644
--- a/extra/rust/patches/musl.patch
+++ b/extra/rust/patches/musl.patch
@@ -1,8 +1,8 @@
 diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
-index 8e5fe25..0d3e27e 100644
+index eced035..f988315 100644
 --- a/src/bootstrap/compile.rs
 +++ b/src/bootstrap/compile.rs
-@@ -136,7 +136,7 @@ fn copy_third_party_objects(builder: &Builder<'_>, compiler: &Compiler, target:
+@@ -132,7 +132,7 @@ fn copy_third_party_objects(
      // with a glibc-targeting toolchain, given we have the appropriate startup
      // files. As those shipped with glibc won't work, copy the ones provided by
      // musl so we have them on linux-gnu hosts.
@@ -12,10 +12,10 @@ index 8e5fe25..0d3e27e 100644
          for &obj in &["crt1.o", "crti.o", "crtn.o"] {
              copy_and_stamp(&srcdir, obj);
 diff --git a/src/bootstrap/sanity.rs b/src/bootstrap/sanity.rs
-index bffe748f3..40f9f597f 100644
+index 8ff7056..53c0194 100644
 --- a/src/bootstrap/sanity.rs
 +++ b/src/bootstrap/sanity.rs
-@@ -188,7 +188,7 @@ pub fn check(build: &mut Build) {
+@@ -205,7 +205,7 @@ pub fn check(build: &mut Build) {
          }
 
          // Make sure musl-root is valid
@@ -25,7 +25,7 @@ index bffe748f3..40f9f597f 100644
              // fall back to the system toolchain in /usr before giving up
              if build.musl_root(*target).is_none() && build.config.build == *target {
 diff --git a/src/librustc_target/spec/linux_musl_base.rs b/src/librustc_target/spec/linux_musl_base.rs
-index e294e6398..17fecb3b2 100644
+index e294e63..17fecb3 100644
 --- a/src/librustc_target/spec/linux_musl_base.rs
 +++ b/src/librustc_target/spec/linux_musl_base.rs
 @@ -26,7 +26,7 @@ pub fn opts() -> TargetOptions {
@@ -37,8 +37,9 @@ index e294e6398..17fecb3b2 100644
      // These targets allow the user to choose between static and dynamic linking.
      base.crt_static_respected = true;
 
+
 diff --git a/src/libunwind/build.rs b/src/libunwind/build.rs
-index f24d957d6..4632212fd 100644
+index a24808b..25300a5 100644
 --- a/src/libunwind/build.rs
 +++ b/src/libunwind/build.rs
 @@ -10,7 +10,7 @@ fn main() {
@@ -50,11 +51,12 @@ index f24d957d6..4632212fd 100644
              // linking for musl is handled in lib.rs
              llvm_libunwind::compile();
          } else if !target.contains("android") {
+
 diff --git a/src/libunwind/lib.rs b/src/libunwind/lib.rs
-index 8d9164471..3adaaf43d 100644
+index 18d41be..6fddd6d 100644
 --- a/src/libunwind/lib.rs
 +++ b/src/libunwind/lib.rs
-@@ -20,7 +20,7 @@ cfg_if::cfg_if! {
+@@ -18,7 +18,7 @@ cfg_if::cfg_if! {
      }
  }
 
@@ -62,12 +64,13 @@ index 8d9164471..3adaaf43d 100644
 +#[cfg(target_env = "noop")]
  #[link(name = "unwind", kind = "static", cfg(target_feature = "crt-static"))]
  #[link(name = "gcc_s", cfg(not(target_feature = "crt-static")))]
- extern {}
+ extern "C" {}
+
 diff --git a/vendor/libc/src/unix/mod.rs b/vendor/libc/src/unix/mod.rs
-index 721d24116..26bf271cd 100644
+index 238da24..71d4f31 100644
 --- a/vendor/libc/src/unix/mod.rs
 +++ b/vendor/libc/src/unix/mod.rs
-@@ -296,7 +296,7 @@ cfg_if! {
+@@ -298,7 +298,7 @@ cfg_if! {
      } else if #[cfg(feature = "std")] {
          // cargo build, don't pull in anything extra as the libstd dep
          // already pulls in all libs.
@@ -76,3 +79,4 @@ index 721d24116..26bf271cd 100644
          #[cfg_attr(feature = "rustc-dep-of-std",
                     link(name = "c", kind = "static",
                          cfg(target_feature = "crt-static")))]
+
diff --git a/extra/rust/sources b/extra/rust/sources
index 15440df2..f1a68ebc 100644
--- a/extra/rust/sources
+++ b/extra/rust/sources
@@ -1,5 +1,5 @@
-https://static.rust-lang.org/dist/rustc-1.41.1-src.tar.xz
-https://static.rust-lang.org/dist/2019-12-19/rust-std-1.40.0-x86_64-unknown-linux-musl.tar.xz?no-extract
-https://static.rust-lang.org/dist/2019-12-19/rustc-1.40.0-x86_64-unknown-linux-musl.tar.xz?no-extract
-https://static.rust-lang.org/dist/2019-12-19/cargo-0.41.0-x86_64-unknown-linux-musl.tar.xz?no-extract
+https://static.rust-lang.org/dist/rustc-1.42.0-src.tar.xz
+https://static.rust-lang.org/dist/2020-02-27/rust-std-1.41.1-x86_64-unknown-linux-musl.tar.xz?no-extract
+https://static.rust-lang.org/dist/2020-02-27/rustc-1.41.1-x86_64-unknown-linux-musl.tar.xz?no-extract
+https://static.rust-lang.org/dist/2020-02-27/cargo-0.42.0-x86_64-unknown-linux-musl.tar.xz?no-extract
 patches/musl.patch
diff --git a/extra/rust/version b/extra/rust/version
index fdf97314..4c2e665d 100644
--- a/extra/rust/version
+++ b/extra/rust/version
@@ -1 +1 @@
-1.41.1 1
+1.42.0 1