diff options
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/src/core/builder/tests.rs | 2 | ||||
| -rw-r--r-- | src/bootstrap/src/core/metadata.rs | 5 | ||||
| -rw-r--r-- | src/bootstrap/src/lib.rs | 2 |
3 files changed, 2 insertions, 7 deletions
diff --git a/src/bootstrap/src/core/builder/tests.rs b/src/bootstrap/src/core/builder/tests.rs index 343fbcc0286..b062781e68a 100644 --- a/src/bootstrap/src/core/builder/tests.rs +++ b/src/bootstrap/src/core/builder/tests.rs @@ -655,7 +655,7 @@ mod dist { let mut builder = Builder::new(&build); builder.run_step_descriptions( &Builder::get_step_descriptions(Kind::Build), - &["compiler/rustc".into(), "std".into()], + &["compiler/rustc".into(), "library".into()], ); assert_eq!(builder.config.stage, 2); diff --git a/src/bootstrap/src/core/metadata.rs b/src/bootstrap/src/core/metadata.rs index 3720602dc77..2706aba5ffc 100644 --- a/src/bootstrap/src/core/metadata.rs +++ b/src/bootstrap/src/core/metadata.rs @@ -62,11 +62,6 @@ pub fn build(build: &mut Build) { let relative_path = krate.local_path(build); build.crates.insert(name.clone(), krate); let existing_path = build.crate_paths.insert(relative_path, name); - // `literal-escaper` is both a dependency of `compiler/rustc_lexer` and of - // `library/proc-macro`, making it appear multiple times in the workspace. - if existing_path.as_deref() == Some("literal-escaper") { - continue; - } assert!( existing_path.is_none(), "multiple crates with the same path: {}", diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs index 1943d0299b9..1fba17dcf30 100644 --- a/src/bootstrap/src/lib.rs +++ b/src/bootstrap/src/lib.rs @@ -716,7 +716,7 @@ impl Build { features.push("llvm"); } // keep in sync with `bootstrap/compile.rs:rustc_cargo_env` - if self.config.rust_randomize_layout && check("rustc_randomized_layouts") { + if self.config.rust_randomize_layout { features.push("rustc_randomized_layouts"); } |