diff options
Diffstat (limited to 'extra/rust')
| -rwxr-xr-x | extra/rust/build | 2 | ||||
| -rw-r--r-- | extra/rust/checksums | 10 | ||||
| -rw-r--r-- | extra/rust/patches/musl-libressl.patch | 20 | ||||
| -rw-r--r-- | extra/rust/sources | 8 | ||||
| -rw-r--r-- | extra/rust/version | 2 |
5 files changed, 21 insertions, 21 deletions
diff --git a/extra/rust/build b/extra/rust/build index f02d3b3e..674d1700 100755 --- a/extra/rust/build +++ b/extra/rust/build @@ -5,7 +5,7 @@ # connection requirement per build further enabling checksums # and signature verification by KISS. { - cache_dir=build/cache/2019-09-26 + cache_dir=build/cache/2019-11-07 mkdir -p "$cache_dir" for tarball in *.tar.gz\?no-extract; do diff --git a/extra/rust/checksums b/extra/rust/checksums index 6570ccd3..b67e0616 100644 --- a/extra/rust/checksums +++ b/extra/rust/checksums @@ -1,5 +1,5 @@ -b4a1f6b6a93931f270691aba4fc85eee032fecda973e6b9c774cd06857609357 rustc-1.39.0-src.tar.gz -56b87fdca1f41b634285593cae42fdbd5fe9632ef502336679362b283ed53c22 rust-std-1.38.0-x86_64-unknown-linux-musl.tar.gz?no-extract -bb0166cbb1d31bcb09d79224e7ac43a80d9448b7199b5392a3852b3ec71840aa rustc-1.38.0-x86_64-unknown-linux-musl.tar.gz?no-extract -bbf58bf638c5c4cf86caaa1bfe2835b3856d4ef46447c9942d5e59cc7654c5e4 cargo-0.39.0-x86_64-unknown-linux-musl.tar.gz?no-extract -122b5d9b83778882bdd64d40fea98982f7d1db510e09fc64a4ece5add4fd99a2 musl-libressl.patch +dd97005578defc10a482bff3e4e728350d2099c60ffcf1f5e189540c39a549ad rustc-1.40.0-src.tar.gz +9c6b49e161e53c174b4fd46825a96b78854cfbcd0971ce846d4edd33c2b5f275 rust-std-1.39.0-x86_64-unknown-linux-musl.tar.gz?no-extract +07a9705dd77c6859ef921389dc6a958a297030e53571fe015163c79aa93d1e43 rustc-1.39.0-x86_64-unknown-linux-musl.tar.gz?no-extract +c3a04bfe988f84dc4bffd8b4fef29f2ad461483fd22e4bf329d2189e16213d0c cargo-0.40.0-x86_64-unknown-linux-musl.tar.gz?no-extract +bc6a567b76c3186ac868c13831c402c595015ad48e047387b32f833af460f7fa musl-libressl.patch 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); diff --git a/extra/rust/sources b/extra/rust/sources index a1e63232..a6e7cb5d 100644 --- a/extra/rust/sources +++ b/extra/rust/sources @@ -1,5 +1,5 @@ -https://static.rust-lang.org/dist/rustc-1.39.0-src.tar.gz -https://static.rust-lang.org/dist/2019-09-26/rust-std-1.38.0-x86_64-unknown-linux-musl.tar.gz?no-extract -https://static.rust-lang.org/dist/2019-09-26/rustc-1.38.0-x86_64-unknown-linux-musl.tar.gz?no-extract -https://static.rust-lang.org/dist/2019-09-26/cargo-0.39.0-x86_64-unknown-linux-musl.tar.gz?no-extract +https://static.rust-lang.org/dist/rustc-1.40.0-src.tar.gz +https://static.rust-lang.org/dist/2019-11-07/rust-std-1.39.0-x86_64-unknown-linux-musl.tar.gz?no-extract +https://static.rust-lang.org/dist/2019-11-07/rustc-1.39.0-x86_64-unknown-linux-musl.tar.gz?no-extract +https://static.rust-lang.org/dist/2019-11-07/cargo-0.40.0-x86_64-unknown-linux-musl.tar.gz?no-extract patches/musl-libressl.patch diff --git a/extra/rust/version b/extra/rust/version index 07fabd51..08770197 100644 --- a/extra/rust/version +++ b/extra/rust/version @@ -1 +1 @@ -1.39.0 1 +1.40.0 1 |