From c36849a542cdff30f7eaa829433f31d4bcb79c56 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 15 Aug 2019 13:46:54 -0700 Subject: [PATCH] bootstrap: Move `-Zdual-proc-macros` to `builder.rs` --- src/bootstrap/bin/rustc.rs | 6 ------ src/bootstrap/builder.rs | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/bootstrap/bin/rustc.rs b/src/bootstrap/bin/rustc.rs index 3c836ce261d..1955ca4aa99 100644 --- a/src/bootstrap/bin/rustc.rs +++ b/src/bootstrap/bin/rustc.rs @@ -124,12 +124,6 @@ fn main() { cmd.arg("--sysroot").arg(&sysroot); } - // Link crates to the proc macro crate for the target, but use a host proc macro crate - // to actually run the macros - if env::var_os("RUST_DUAL_PROC_MACROS").is_some() { - cmd.arg("-Zdual-proc-macros"); - } - // When we build Rust dylibs they're all intended for intermediate // usage, so make sure we pass the -Cprefer-dynamic flag instead of // linking all deps statically into the dylib. diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index 5481e3d86e4..ee62b397678 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -802,7 +802,7 @@ pub fn cargo( // Build proc macros both for the host and the target if target != compiler.host && cmd != "check" { cargo.arg("-Zdual-proc-macros"); - cargo.env("RUST_DUAL_PROC_MACROS", "1"); + rustflags.arg("-Zdual-proc-macros"); } }, } -- GitLab