RUSTFLAGS: Add -Zforce-unstable-if-unmarked

This fixes a regression in the HashMap module of libstd that was merged without a stability marker. Signed-off-by: Sean Cross <[email protected]>
betrusted-io · Dec 5, 2024 · 3a0b800 · 3a0b800
1 parent 4c35365
commit 3a0b800
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -105,7 +105,7 @@ jobs:
           CARGO_PROFILE_RELEASE_OPT_LEVEL: 3
           CARGO_PROFILE_RELEASE_DEBUG_ASSERTIONS: false
           RUSTC_BOOTSTRAP: 1
-          RUSTFLAGS: -Cforce-unwind-tables=yes -Cembed-bitcode=yes
+          RUSTFLAGS: -Cforce-unwind-tables=yes -Cembed-bitcode=yes -Zforce-unstable-if-unmarked=yes
           __CARGO_DEFAULT_LIB_METADATA: stablestd
           CC: riscv-none-elf-gcc
           AR: riscv-none-elf-ar
diff --git a/build.ps1 b/build.ps1
@@ -34,7 +34,7 @@ $env:CARGO_PROFILE_RELEASE_DEBUG = 0
 $env:CARGO_PROFILE_RELEASE_OPT_LEVEL = ""
 $env:CARGO_PROFILE_RELEASE_DEBUG_ASSERTIONS = "true"
 $env:RUSTC_BOOTSTRAP = 1
-$env:RUSTFLAGS = "-Cforce-unwind-tables=yes -Cembed-bitcode=yes"
+$env:RUSTFLAGS = "-Cforce-unwind-tables=yes -Cembed-bitcode=yes -Zforce-unstable-if-unmarked=yes"
 $env:__CARGO_DEFAULT_LIB_METADATA = "stablestd"
 
 # Set up the C compiler. We need to explicitly specify these variables

diff --git a/build.sh b/build.sh
@@ -33,7 +33,7 @@ export CARGO_PROFILE_RELEASE_DEBUG=0
 export CARGO_PROFILE_RELEASE_OPT_LEVEL="3"
 export CARGO_PROFILE_RELEASE_DEBUG_ASSERTIONS="true"
 export RUSTC_BOOTSTRAP=1
-export RUSTFLAGS="-Cforce-unwind-tables=yes -Cembed-bitcode=yes"
+export RUSTFLAGS="-Cforce-unwind-tables=yes -Cembed-bitcode=yes -Zforce-unstable-if-unmarked=yes"
 export __CARGO_DEFAULT_LIB_METADATA="stablestd"
 
 command_exists() {

diff --git a/rebuild.sh b/rebuild.sh
@@ -36,7 +36,7 @@ export CARGO_PROFILE_RELEASE_DEBUG=0
 export CARGO_PROFILE_RELEASE_OPT_LEVEL="3"
 export CARGO_PROFILE_RELEASE_DEBUG_ASSERTIONS="true"
 export RUSTC_BOOTSTRAP=1
-export RUSTFLAGS="-Cforce-unwind-tables=yes -Cembed-bitcode=yes"
+export RUSTFLAGS="-Cforce-unwind-tables=yes -Cembed-bitcode=yes -Zforce-unstable-if-unmarked=yes"
 export __CARGO_DEFAULT_LIB_METADATA="stablestd"
 
 command_exists() {