rust: bump to 1.40

1 files changed, 10 insertions, 10 deletions

diff --git a/extra/rust/patches/musl-libressl.patch b/extra/rust/patches/musl-libressl.patch
index ed1f2404..33402597 100644
--- a/extra/rust/patches/musl-libressl.patch
+++ b/extra/rust/patches/musl-libressl.patch
@@ -1,23 +1,23 @@
 diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
-index 6ea32edfb..9d6d10f7f 100644
+index 8e5fe25..0d3e27e 100644
 --- a/src/bootstrap/compile.rs
 +++ b/src/bootstrap/compile.rs
-@@ -122,7 +122,7 @@ fn copy_third_party_objects(builder: &Builder<'_>, compiler: &Compiler, target:
+@@ -136,7 +136,7 @@ fn copy_third_party_objects(builder: &Builder<'_>, compiler: &Compiler, target:
      // 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.
 -    if target.contains("musl") {
 +    if target.contains("noop") {
+         let srcdir = builder.musl_root(target).unwrap().join("lib");
          for &obj in &["crt1.o", "crti.o", "crtn.o"] {
-             builder.copy(
-                 &builder.musl_root(target).unwrap().join("lib").join(obj),
+             copy_and_stamp(&srcdir, obj);
 diff --git a/src/bootstrap/sanity.rs b/src/bootstrap/sanity.rs
 index bffe748f3..40f9f597f 100644
 --- a/src/bootstrap/sanity.rs
 +++ b/src/bootstrap/sanity.rs
 @@ -188,7 +188,7 @@ pub fn check(build: &mut Build) {
          }
- 
+
          // Make sure musl-root is valid
 -        if target.contains("musl") {
 +        if target.contains("noop") {
@@ -30,13 +30,13 @@ index e294e6398..17fecb3b2 100644
 +++ b/src/librustc_target/spec/linux_musl_base.rs
 @@ -26,7 +26,7 @@ pub fn opts() -> TargetOptions {
      base.post_link_objects_crt.push("crtn.o".to_string());
- 
+
      // These targets statically link libc by default
 -    base.crt_static_default = true;
 +    base.crt_static_default = false;
      // 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
 --- a/src/libunwind/build.rs
@@ -57,7 +57,7 @@ index 8d9164471..3adaaf43d 100644
 @@ -20,7 +20,7 @@ cfg_if::cfg_if! {
      }
  }
- 
+
 -#[cfg(target_env = "musl")]
 +#[cfg(target_env = "noop")]
  #[link(name = "unwind", kind = "static", cfg(target_feature = "crt-static"))]
@@ -83,7 +83,7 @@ index 02b93b90a..27deca5fe 100644
 @@ -183,27 +183,30 @@ See rust-openssl README for more information:
      if let Some(libressl_version) = libressl_version {
          println!("cargo:libressl_version_number={:x}", libressl_version);
- 
+
 +        let major = (libressl_version >> 28) as u8;
          let minor = (libressl_version >> 20) as u8;
          let fix = (libressl_version >> 12) as u8;
@@ -119,7 +119,7 @@ index 02b93b90a..27deca5fe 100644
 +            (3, 0, 0) => ('3', '0', '0'),
              _ => version_error(),
          };
- 
+
          println!("cargo:libressl=true");
 -        println!("cargo:libressl_version=2{}{}", minor, fix);
 +        println!("cargo:libressl_version={}{}{}", major, minor, fix);