Skip to content

Update bootstrap to use -Zembed-metadata=no instead of -Zno-embed-metadata #159781

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
rust-bors merged 1 commit into from
Jul 24, 2026
+6 −14
Merged

Update bootstrap to use -Zembed-metadata=no instead of -Zno-embed-metadata #159781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 0 additions & 13 deletions compiler/rustc_codegen_cranelift/scripts/setup_rust_fork.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,19 +62,6 @@ index 2e16f2cf27..3ac3df99a8 100644
# Add RUSTFLAGS_BOOTSTRAP to RUSTFLAGS for bootstrap compilation.
# Note that RUSTFLAGS_BOOTSTRAP should always be added to the end of
# RUSTFLAGS, since that causes RUSTFLAGS_BOOTSTRAP to override RUSTFLAGS.
diff --git a/src/bootstrap/src/core/builder/cargo.rs b/src/bootstrap/src/core/builder/cargo.rs
index 6de70c7d70c..d5035b581ce 100644
--- a/src/bootstrap/src/core/builder/cargo.rs
+++ b/src/bootstrap/src/core/builder/cargo.rs
@@ -1197,7 +1197,7 @@ fn cargo(
cargo.env("RUSTC_BOOTSTRAP", "1");

if matches!(mode, Mode::Std) {
- cargo.arg("-Zno-embed-metadata");
+ cargo.arg("-Zembed-metadata=no");
}

if self.config.dump_bootstrap_shims {
diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
index bc68bfe396..00143ef3ed 100644
--- a/src/bootstrap/src/core/config/config.rs
Expand Down
7 changes: 6 additions & 1 deletion src/bootstrap/src/core/builder/cargo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1197,7 +1197,12 @@ impl Builder<'_> {
cargo.env("RUSTC_BOOTSTRAP", "1");

if matches!(mode, Mode::Std) {
cargo.arg("-Zno-embed-metadata");
// The `-Zembed-metadata` flag was renamed from `-Zno-embed-metadata`.
if self.local_rebuild {
cargo.arg("-Zembed-metadata=no");
} else {
cargo.arg("-Zno-embed-metadata");
}
}

if self.config.dump_bootstrap_shims {
Expand Down
Loading