about summary refs log tree commit diff
diff options
context:
space:
mode:
authorfee1-dead <ent3rm4n@gmail.com>2022-09-26 13:09:42 +0800
committerGitHub <noreply@github.com>2022-09-26 13:09:42 +0800
commit0cee03dfffcfdc2709a41823f5ce726877205fbd (patch)
treea51f1be3f22ddcc2c4597a991bef61398b4fb90a
parent0adf293f87fb354bf9a44e3e2f1c2b5a3578d880 (diff)
parentc8d346e527fc556e3d3715c963c98a474a543320 (diff)
downloadrust-0cee03dfffcfdc2709a41823f5ce726877205fbd.tar.gz
rust-0cee03dfffcfdc2709a41823f5ce726877205fbd.zip
Rollup merge of #102178 - RalfJung:bootstrap-backtrace, r=Mark-Simulacrum
bootstrap: the backtrace feature is stable, no need to allow it any more
-rw-r--r--src/bootstrap/builder.rs5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
index c33b7fc7cd6..415774d7255 100644
--- a/src/bootstrap/builder.rs
+++ b/src/bootstrap/builder.rs
@@ -1557,13 +1557,12 @@ impl<'a> Builder<'a> {
         match mode {
             Mode::ToolBootstrap => {
                 // Restrict the allowed features to those passed by rustbuild, so we don't depend on nightly accidentally.
-                // HACK: because anyhow does feature detection in build.rs, we need to allow the backtrace feature too.
-                rustflags.arg("-Zallow-features=binary-dep-depinfo,backtrace");
+                rustflags.arg("-Zallow-features=binary-dep-depinfo");
             }
             Mode::ToolStd => {
                 // Right now this is just compiletest and a few other tools that build on stable.
                 // Allow them to use `feature(test)`, but nothing else.
-                rustflags.arg("-Zallow-features=binary-dep-depinfo,test,backtrace,proc_macro_internals,proc_macro_diagnostic,proc_macro_span");
+                rustflags.arg("-Zallow-features=binary-dep-depinfo,test,proc_macro_internals,proc_macro_diagnostic,proc_macro_span");
             }
             Mode::Std | Mode::Rustc | Mode::Codegen | Mode::ToolRustc => {}
         }