diff --git a/extra/rust/build b/extra/rust/build index 31cd24ca..8710d438 100755 --- a/extra/rust/build +++ b/extra/rust/build @@ -10,7 +10,7 @@ export RUSTFLAGS="$RUSTFLAGS --remap-path-prefix=$PWD=." # bootstrap library to allow for the removal of the internet # connection requirement per build. { - mkdir -p "${cache_dir:=build/cache/2022-01-13}" + mkdir -p "${cache_dir:=build/cache/2022-02-24}" for tarball in *.tar.xz\?no-extract; do mv -f "$tarball" "$cache_dir/${tarball%%\?no-extract}" @@ -18,18 +18,11 @@ export RUSTFLAGS="$RUSTFLAGS --remap-path-prefix=$PWD=." } # Set shared linking as the default. -for f in \ - compiler/rustc_target/src/spec/linux_musl_base.rs \ - vendor/rustc-ap-rustc_target/src/spec/linux_musl_base.rs -do - sed 's/\(crt_static_default = \)true/\1false/' "$f" > _ - mv -f _ "$f" -done +sed 's/\(crt_static_default = \)true/\1false/' \ + compiler/rustc_target/src/spec/linux_musl_base.rs > _ +mv -f _ compiler/rustc_target/src/spec/linux_musl_base.rs # Ignore checksums of files modified above. -sed 's/\("files":{\)[^}]*/\1/' \ - vendor/rustc-ap-rustc_target/.cargo-checksum.json > _ -mv -f _ vendor/rustc-ap-rustc_target/.cargo-checksum.json sed 's/\("files":{\)[^}]*/\1/' \ vendor/curl-sys/.cargo-checksum.json > _ mv -f _ vendor/curl-sys/.cargo-checksum.json diff --git a/extra/rust/checksums b/extra/rust/checksums index a347d32d..18e29630 100644 --- a/extra/rust/checksums +++ b/extra/rust/checksums @@ -1,5 +1,5 @@ -375996ead731cab2203ec10a66a3c4568ab6997d7e5d3ae597658164fe27be3d -dc839b669ab75699a1c85f6cf0a50d632cbeb18ab0ef08ce2fac0bb3008d07c1 -3ed55e845dc5ac8d70609edad2cdb60fe3c36a22be6a22f7d30eab43896420b3 -94a4a8ea22daa39cc33f2372e83bc1a9f66cef43b002c78ee34551d4720d12a9 +a025876deccbcb3f288d8e02623ea321f94623f31305d3c5c6f17855bb9685db +473b6ddf598418db49efc21c3d2702cdaf9c78ee4ae00611c7d9e384a2d4dad7 +e0b543b36f8b3471975e5982f7c93894947af315932dd3305d1cf5763c4f5d4e +95f2727f22f40d7a294f08d24dc7b5f4fb4fe3991854becceffa75bf8f049745 2be91d7548e55476a4e62aca25dae606a06a36ef30b51af4da5bec4da400c3b0 diff --git a/extra/rust/sources b/extra/rust/sources index 50c8ed4a..f884b266 100644 --- a/extra/rust/sources +++ b/extra/rust/sources @@ -1,5 +1,5 @@ https://static.rust-lang.org/dist/rustc-VERSION-src.tar.xz -https://static.rust-lang.org/dist/2022-01-13/rust-std-1.58.0-x86_64-unknown-linux-musl.tar.xz?no-extract -https://static.rust-lang.org/dist/2022-01-13/rustc-1.58.0-x86_64-unknown-linux-musl.tar.xz?no-extract -https://static.rust-lang.org/dist/2022-01-13/cargo-1.58.0-x86_64-unknown-linux-musl.tar.xz?no-extract +https://static.rust-lang.org/dist/2022-02-24/rust-std-1.59.0-x86_64-unknown-linux-musl.tar.xz?no-extract +https://static.rust-lang.org/dist/2022-02-24/rustc-1.59.0-x86_64-unknown-linux-musl.tar.xz?no-extract +https://static.rust-lang.org/dist/2022-02-24/cargo-1.59.0-x86_64-unknown-linux-musl.tar.xz?no-extract patches/fix-curl.patch diff --git a/extra/rust/version b/extra/rust/version index 93c7d60d..2737e597 100644 --- a/extra/rust/version +++ b/extra/rust/version @@ -1 +1 @@ -1.59.0 1 +1.60.0 1