Skip to content

update Rust to 1.87.0 #275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 1, 2025
Merged

update Rust to 1.87.0 #275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c23cb51
rust: set panic=abort for custom targets
bcressey Mar 28, 2025
83b313f
update Rust to 1.85.1
bcressey Mar 28, 2025
089cdda
update Rust to 1.86.0
bcressey Apr 21, 2025
9540532
update Rust to 1.87.0
bcressey May 15, 2025
d69f1f0
macros: write cargo config to config.toml
bcressey May 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,11 +285,10 @@ RUN \

ARG HOST_ARCH
ENV VENDOR="bottlerocket"
ENV RUSTVER="1.85.0"
ENV RUSTVER="1.87.0"

USER builder
WORKDIR /home/builder
COPY ./patches/rust ./patches
COPY ./hashes/rust ./hashes
RUN \
sdk-fetch hashes && \
Expand All @@ -300,8 +299,7 @@ RUN \
WORKDIR /home/builder/rust
RUN \
dir=build/cache/$(awk -F= '/^compiler_date/{print $2}' src/stage0); \
mkdir -p $dir && mv ../*.xz $dir && \
find "${HOME}/patches" -type f -name '*.patch' -print -exec patch -p1 -i {} \;
mkdir -p $dir && mv ../*.xz $dir

# For any architecture, we rely on two or more of Rust's native targets:
#
Expand Down
3 changes: 2 additions & 1 deletion configs/rust/targets/aarch64-bottlerocket-linux-gnu.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,6 @@
],
"target-mcount": "\u0001_mcount",
"target-pointer-width": "64",
"vendor": "bottlerocket"
"vendor": "bottlerocket",
"panic-strategy": "abort"
}
3 changes: 2 additions & 1 deletion configs/rust/targets/aarch64-bottlerocket-linux-musl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,5 +98,6 @@
],
"target-mcount": "\u0001_mcount",
"target-pointer-width": "64",
"vendor": "bottlerocket"
"vendor": "bottlerocket",
"panic-strategy": "abort"
}
3 changes: 2 additions & 1 deletion configs/rust/targets/x86_64-bottlerocket-linux-gnu.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,6 @@
"unix"
],
"target-pointer-width": "64",
"vendor": "bottlerocket"
"vendor": "bottlerocket",
"panic-strategy": "abort"
}
3 changes: 2 additions & 1 deletion configs/rust/targets/x86_64-bottlerocket-linux-musl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,5 +107,6 @@
"unix"
],
"target-pointer-width": "64",
"vendor": "bottlerocket"
"vendor": "bottlerocket",
"panic-strategy": "abort"
}
30 changes: 15 additions & 15 deletions hashes/rust
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# https://static.rust-lang.org/dist/rustc-1.85.0-src.tar.xz
SHA512 (rustc-1.85.0-src.tar.xz) = 3e9c933d1d9b6e5fb081837cf07eb1638b1a6b4fd1cb607dd860c5021ba7b521edbaf8ba0fa8f182f62178b72a3e1a3e6b26675e8fb6530871137852a074443c
### See https://raw.githubusercontent.com/rust-lang/rust/1.85.0/src/stage0 for what to use below. ###
# https://static.rust-lang.org/dist/2025-01-09/rust-std-1.84.0-x86_64-unknown-linux-gnu.tar.xz
SHA512 (rust-std-1.84.0-x86_64-unknown-linux-gnu.tar.xz) = d494e845341c6f87589075087ae73a7eaadce4b5555c732c850684ba698276d9aa373a7d02a0301ded328f2181d8847aa4f7bfe3303f5acf4087a2964b0678a5
# https://static.rust-lang.org/dist/2025-01-09/rustc-1.84.0-x86_64-unknown-linux-gnu.tar.xz
SHA512 (rustc-1.84.0-x86_64-unknown-linux-gnu.tar.xz) = a5638abcdb2e12218e7487d95764e4d66ffdc14c71b700e973f5dc122b01fa7f8684f013606cbabf9ce5d4f23b934f0db567d96c2467a1a11c6b2e0201c6e7fe
# https://static.rust-lang.org/dist/2025-01-09/cargo-1.84.0-x86_64-unknown-linux-gnu.tar.xz
SHA512 (cargo-1.84.0-x86_64-unknown-linux-gnu.tar.xz) = 3b80d83b74dca07f94460030387a7799bba0bb086df5aaf373a5f5a04feea1ba490f72a6a12f3eaa8150a9484a8658ff1bfe73e75279d8e7f775e5c8aa6eb292
# https://static.rust-lang.org/dist/2025-01-09/rust-std-1.84.0-aarch64-unknown-linux-gnu.tar.xz
SHA512 (rust-std-1.84.0-aarch64-unknown-linux-gnu.tar.xz) = 0caeca87316e5a5d5ade4e3ece1c4945b7da4ea6b9079176b303df2b4e131da09d09fa0faeaa0cad2e6d30136804b352d89beae6a832a56230ffc2068b195434
# https://static.rust-lang.org/dist/2025-01-09/rustc-1.84.0-aarch64-unknown-linux-gnu.tar.xz
SHA512 (rustc-1.84.0-aarch64-unknown-linux-gnu.tar.xz) = 0a4ab2854c4e33e4678b8b41c537c9695af1eea6607124e6452804591053feddefcba9542fb5c970a9168edcfc6f83b28b8e0f79fe0f2ba6a25a2906fed92759
# https://static.rust-lang.org/dist/2025-01-09/cargo-1.84.0-aarch64-unknown-linux-gnu.tar.xz
SHA512 (cargo-1.84.0-aarch64-unknown-linux-gnu.tar.xz) = 1cfae547dab35ca12cf07de93375492eb7d6ccc08ae485e8f4a49d2b714f31129dac2f3d748dc603028a932f44b296f9e09ed7fb0d6addeaa5cc0aed93d4eabe
# https://static.rust-lang.org/dist/rustc-1.87.0-src.tar.xz
SHA512 (rustc-1.87.0-src.tar.xz) = 2ef08c9be45434401f916d54b3739f52d255f8a3a4ce05a717499250c2333eeaf601f1d18085b878c027c609f44da74d0151f5bfc2c9ae1e01166919a91a1d2b
### See https://raw.githubusercontent.com/rust-lang/rust/1.87.0/src/stage0 for what to use below. ###
# https://static.rust-lang.org/dist/2025-04-03/rust-std-1.86.0-x86_64-unknown-linux-gnu.tar.xz
SHA512 (rust-std-1.86.0-x86_64-unknown-linux-gnu.tar.xz) = 4e6c73db6eb9235d0656eaa04d968d7e0ee0b1beb132e59affcfcb9141e3da0861fdf900109c66221a20bc70d4150f19955419ff865b34aa5b883d7b4fc0ab0b
# https://static.rust-lang.org/dist/2025-04-03/rustc-1.86.0-x86_64-unknown-linux-gnu.tar.xz
SHA512 (rustc-1.86.0-x86_64-unknown-linux-gnu.tar.xz) = 849d324b79918a1796288425b5121e6ca1d55a7588dfa1d284c07c2f6c39ee94775b4e74dbd7e99cf9b471b3744d403310455b33e898378d09ecad853d1f0c88
# https://static.rust-lang.org/dist/2025-04-03/cargo-1.86.0-x86_64-unknown-linux-gnu.tar.xz
SHA512 (cargo-1.86.0-x86_64-unknown-linux-gnu.tar.xz) = 19ef3de97fc0a21bde800c5a10bfda835d9cc48399d473b65e245d2b16d42e172454579eca4c4acd72107e0a5796d82ea185b834a2d9a23cf27e74c02232bc3e
# https://static.rust-lang.org/dist/2025-04-03/rust-std-1.86.0-aarch64-unknown-linux-gnu.tar.xz
SHA512 (rust-std-1.86.0-aarch64-unknown-linux-gnu.tar.xz) = 25be69a030f013bf431376b5e9e0d7c03e703b4e1780f9644b66f789da3d5bf4b38cee1b36c204423e5454cd08cb42c7e98a8cfc0cad8946ae70832b012c8f2e
# https://static.rust-lang.org/dist/2025-04-03/rustc-1.86.0-aarch64-unknown-linux-gnu.tar.xz
SHA512 (rustc-1.86.0-aarch64-unknown-linux-gnu.tar.xz) = e17ab6f2d54fb24f2bffbe584e2cab88da776c0a67ee464f63c132ef58ee4070467705c07cbda1de7920a94ae048a6973f2ad2f9f7437132000b033a4c041102
# https://static.rust-lang.org/dist/2025-04-03/cargo-1.86.0-aarch64-unknown-linux-gnu.tar.xz
SHA512 (cargo-1.86.0-aarch64-unknown-linux-gnu.tar.xz) = d8fd6cc891a9639670731b06098b5ea1729f8b9a78ee6f64cd1fece0557020533d401bb4a3edc7870d2c801cd2748af70eab105581df7bbff831f151194cc230
2 changes: 1 addition & 1 deletion macros/cargo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
%write_cross_cmake_toolchain_conf \
%write_cross_cmake_toolchain_conf_static \
%{__mkdir} -p %{_builddir}/.cargo \
cat > %{_builddir}/.cargo/config << EOF \
cat > %{_builddir}/.cargo/config.toml << EOF \
[build]\
rustc = "%{__rustc}"\
rustdoc = "%{__rustdoc}"\
Expand Down
92 changes: 0 additions & 92 deletions patches/rust/0001-add-targets-to-vendored-cc-rs-crate.patch
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion tools/update-rust.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ for arch in x86_64 aarch64 ; do
--target "${upstream_target}" \
> "${upstream_spec}"

jq 'del(."is-builtin") | . += {"vendor": "bottlerocket"}' \
jq 'del(."is-builtin") | . += {"vendor": "bottlerocket", "panic-strategy": "abort"}' \
"${upstream_spec}" > "${vendor_spec}"

rm "${upstream_spec}"
Expand Down