From e1832fa4e4700a5f8935ac3e88f7688a15e17df0 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 30 Apr 2020 10:53:16 -0700 Subject: Rename `bitcode-in-rlib` option to `embed-bitcode` This commit finishes work first pioneered in #70458 and started in #71528. The `-C bitcode-in-rlib` option, which has not yet reached stable, is renamed to `-C embed-bitcode` since that more accurately reflects what it does now anyway. Various tests and such are updated along the way as well. This'll also need to be backported to the beta channel to ensure we don't accidentally stabilize `-Cbitcode-in-rlib` as well. --- src/bootstrap/compile.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/bootstrap') diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs index 06ab0a9c310..f50ddf8c967 100644 --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs @@ -232,8 +232,8 @@ pub fn std_cargo(builder: &Builder<'_>, target: Interned, stage: u32, ca } } - // By default, rustc uses `-Cbitcode-in-rlib=yes`, and Cargo overrides that - // with `-Cbitcode-in-rlib=no` for non-LTO builds. However, libstd must be + // By default, rustc uses `-Cembed-bitcode=yes`, and Cargo overrides that + // with `-Cembed-bitcode=no` for non-LTO builds. However, libstd must be // built with bitcode so that the produced rlibs can be used for both LTO // builds (which use bitcode) and non-LTO builds (which use object code). // So we override the override here! @@ -241,7 +241,7 @@ pub fn std_cargo(builder: &Builder<'_>, target: Interned, stage: u32, ca // But we don't bother for the stage 0 compiler because it's never used // with LTO. if stage >= 1 { - cargo.rustflag("-Cbitcode-in-rlib=yes"); + cargo.rustflag("-Cembed-bitcode=yes"); } } -- cgit 1.4.1-3-g733a5