Merge commit '40b00f4200
' into sync_cg_clif-2021-12-30
This commit is contained in:
commit
a8e6d5b04d
20 changed files with 90 additions and 81 deletions
|
@ -10,6 +10,18 @@ pub(crate) fn build_backend(
|
|||
let mut cmd = Command::new("cargo");
|
||||
cmd.arg("build").arg("--target").arg(host_triple);
|
||||
|
||||
cmd.env("CARGO_BUILD_INCREMENTAL", "true"); // Force incr comp even in release mode
|
||||
|
||||
let mut rustflags = env::var("RUSTFLAGS").unwrap_or_default();
|
||||
|
||||
if env::var("CI").as_ref().map(|val| &**val) == Ok("true") {
|
||||
// Deny warnings on CI
|
||||
rustflags += " -Dwarnings";
|
||||
|
||||
// Disabling incr comp reduces cache size and incr comp doesn't save as much on CI anyway
|
||||
cmd.env("CARGO_BUILD_INCREMENTAL", "false");
|
||||
}
|
||||
|
||||
if use_unstable_features {
|
||||
cmd.arg("--features").arg("unstable-features");
|
||||
}
|
||||
|
@ -22,25 +34,20 @@ pub(crate) fn build_backend(
|
|||
_ => unreachable!(),
|
||||
}
|
||||
|
||||
// Set the rpath to make the cg_clif executable find librustc_codegen_cranelift without changing
|
||||
// LD_LIBRARY_PATH
|
||||
if cfg!(unix) {
|
||||
if cfg!(target_os = "macos") {
|
||||
cmd.env(
|
||||
"RUSTFLAGS",
|
||||
"-Csplit-debuginfo=unpacked \
|
||||
rustflags += " -Csplit-debuginfo=unpacked \
|
||||
-Clink-arg=-Wl,-rpath,@loader_path/../lib \
|
||||
-Zosx-rpath-install-name"
|
||||
.to_string()
|
||||
+ env::var("RUSTFLAGS").as_deref().unwrap_or(""),
|
||||
);
|
||||
-Zosx-rpath-install-name";
|
||||
} else {
|
||||
cmd.env(
|
||||
"RUSTFLAGS",
|
||||
"-Clink-arg=-Wl,-rpath=$ORIGIN/../lib ".to_string()
|
||||
+ env::var("RUSTFLAGS").as_deref().unwrap_or(""),
|
||||
);
|
||||
rustflags += " -Clink-arg=-Wl,-rpath=$ORIGIN/../lib ";
|
||||
}
|
||||
}
|
||||
|
||||
cmd.env("RUSTFLAGS", rustflags);
|
||||
|
||||
eprintln!("[BUILD] rustc_codegen_cranelift");
|
||||
crate::utils::spawn_and_wait(cmd);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue