diff --git a/extra/rust/build b/extra/rust/build index 04cbd3d5..9485eac6 100755 --- a/extra/rust/build +++ b/extra/rust/build @@ -10,8 +10,8 @@ export RUSTFLAGS="$RUSTFLAGS --remap-path-prefix=$PWD=." # Set shared linking as the default. 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 + compiler/rustc_target/src/spec/base/linux_musl.rs > _ +mv -f _ compiler/rustc_target/src/spec/base/linux_musl.rs sed 's/\("files":{\)[^}]*/\1/' vendor/curl-sys/.cargo-checksum.json > _ mv -f _ vendor/curl-sys/.cargo-checksum.json @@ -63,7 +63,7 @@ EOF # This mimics the download process of rust's 'x.py' # bootstrap library to allow for the removal of the internet # connection requirement per build. - mkdir -p "${cache_dir:=build/cache/2023-10-05}" + mkdir -p "${cache_dir:=build/cache/2023-11-16}" 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 271f5618..f72d311e 100644 --- a/extra/rust/checksums +++ b/extra/rust/checksums @@ -1,5 +1,5 @@ -59f4bcad87f02afe7f85cea4384eec76d7cf7c38d47a0fdf484f99453598f14258 -a5bb47c283db9525dc1683955c9cd1004fed7d40bd827eebebdeba5b2e74e84080 -7993177eda9da337ff2b64c23b99de2a84dacc6d98a6c55312ddbdded393e1cc02 -9f61428707cb1e5dadbe9294658f0dd5dbc1371f3d6f1ffe71e626b61210236e83 +a255d13a3a1b6d9cef1b6aa707fee1ebf3df46ae656a8888eedfa612d348391818 +05a173b5965fb254452edd3cfe4fca918e0537eafc0817c2f085b012762967415f +eb6d1ee69a98db18df3e0f873ccc137a580cef36a8a85c5c9bd3aebc88c1e5e1e4 +b5942cea1dcb22a4c4af41ecb6cd05082da0a7fb16cf894b67a80298dd020d9e9d 97086f892efe0679b6429e507aa65138ff21d1c776f583e593f5c1911e83bf1e7a diff --git a/extra/rust/sources b/extra/rust/sources index a5ca5948..83feb566 100644 --- a/extra/rust/sources +++ b/extra/rust/sources @@ -1,5 +1,5 @@ -https://static.rust-lang.org/dist/rustc-1.74.1-src.tar.xz -https://static.rust-lang.org/dist/2023-10-05/rust-std-1.73.0-x86_64-unknown-linux-musl.tar.xz?no-extract -https://static.rust-lang.org/dist/2023-10-05/rustc-1.73.0-x86_64-unknown-linux-musl.tar.xz?no-extract -https://static.rust-lang.org/dist/2023-10-05/cargo-1.73.0-x86_64-unknown-linux-musl.tar.xz?no-extract +https://static.rust-lang.org/dist/rustc-1.75.0-src.tar.xz +https://static.rust-lang.org/dist/2023-11-16/rust-std-1.74.0-x86_64-unknown-linux-musl.tar.xz?no-extract +https://static.rust-lang.org/dist/2023-11-16/rustc-1.74.0-x86_64-unknown-linux-musl.tar.xz?no-extract +https://static.rust-lang.org/dist/2023-11-16/cargo-1.74.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 d631d6d2..1737b5f8 100644 --- a/extra/rust/version +++ b/extra/rust/version @@ -1 +1 @@ -1.74.1 1 +1.75.0 1