From e052722c1224bf6f90d974484dd37096153ef0b0 Mon Sep 17 00:00:00 2001 From: "Lance R. Vick" Date: Wed, 31 Jan 2024 05:39:43 -0800 Subject: [PATCH] use system libunwind in rust, replacing nondeterministic in-tree version --- src/core/rust/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/core/rust/Dockerfile b/src/core/rust/Dockerfile index 3ccac80..d4fa85e 100644 --- a/src/core/rust/Dockerfile +++ b/src/core/rust/Dockerfile @@ -158,6 +158,7 @@ RUN set -eux; \ --set="rust.deny-warnings=false" \ --set="rust.parallel-compiler=false" \ --set="rust.remap-debuginfo=true" \ + --set="rust.llvm-libunwind=system" \ --set="build.full-bootstrap=true" \ --set="target.x86_64-unknown-linux-musl.crt-static=false" \ --set="target.x86_64-unknown-linux-musl.musl-root=/usr" \ @@ -178,7 +179,8 @@ RUN set -eux; \ sort -o manifest-rustc manifest-rustc; \ sort -o \ manifest-rust-std-x86_64-unknown-linux-musl \ - manifest-rust-std-x86_64-unknown-linux-musl + manifest-rust-std-x86_64-unknown-linux-musl; \ + rm -f x86_64-unknown-linux-musl/lib/self-contained/libunwind.a COPY --from=musl /lib/* /rootfs/lib/ COPY --from=gcc /usr/lib/* /rootfs/usr/lib/ COPY --from=gcc /usr/lib64/* /rootfs/usr/lib/