Merge pull request #4157 from RalfJung/rustup

Rustup
rust-lang · Jan 28, 2025 · ce9c9ff · ce9c9ff
2 parents 01551dc + 9ee5076
commit ce9c9ff
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/ci/ci.sh b/ci/ci.sh
@@ -14,9 +14,7 @@ function endgroup {
 begingroup "Building Miri"
 
 # Global configuration
-# We are getting some odd linker warnings on macOS, make sure they do not fail the build.
-# (See <https://github.com/rust-lang/rust/issues/136086>.)
-export RUSTFLAGS="-D warnings -A linker-messages"
+export RUSTFLAGS="-D warnings"
 export CARGO_INCREMENTAL=0
 export CARGO_EXTRA_FLAGS="--locked"
 

diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-2f0ad2a71e4a4528bb80bcb24bf8fa4e50cb87c2
+2f348cb7ce4063fa4eb40038e6ada3c5214717bd
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		2f0ad2a71e4a4528bb80bcb24bf8fa4e50cb87c2
		2f348cb7ce4063fa4eb40038e6ada3c5214717bd