development/cargo
development/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo synced 2024-10-14 19:52:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #1368 - cyndis:lto-dyn, r=alexcrichton

Browse source 
When building host code, -C prefer-dynamic is passed, but that option
is mutually exclusive with -C lto. Thus when LTO is specified, rustc
errors out.
This commit is contained in:
bors 2015-03-02 22:15:51 +00:00
parent efa4bd0897 a79c7ead42
commit 98e48728c9
2 changed files with 27 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/cargo/ops/cargo_rustc/mod.rs
View file

@ -587,7 +587,12 @@ fn build_base_args(cx: &Context,
if profile.opt_level() != 0 {
cmd.arg("-C").arg(&format!("opt-level={}", profile.opt_level()));
}
if (target.is_bin() || target.is_staticlib()) && profile.lto() {
// Disable LTO for host builds as prefer_dynamic and it are mutually
// exclusive.
let lto = (target.is_bin() || target.is_staticlib()) && profile.lto() &&
!profile.is_for_host();
if lto {
cmd.args(&["-C", "lto"]);
} else {
// There are some restrictions with LTO and codegen-units, so we

21
tests/test_cargo_compile_custom_build.rs
View file

@ -1099,3 +1099,24 @@ test!(profile_and_opt_level_set_correctly {
assert_that(build.cargo_process("bench"),
execs().with_status(0));
});
test!(build_script_with_lto {
let build = project("builder")
.file("Cargo.toml", r#"
[package]
name = "builder"
version = "0.0.1"
authors = []
build = "build.rs"
[profile.dev]
lto = true
"#)
.file("src/lib.rs", "")
.file("build.rs", r#"
fn main() {
}
"#);
assert_that(build.cargo_process("build"),
execs().with_status(0));
});