user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use LLVM_CMAKE_DIR for lld build

Browse source 
LLVM_CONFIG_PATH is no longer supported as of LLVM 16, switch to
using the cmake module instead.

We separately return the llvm-config and cmake directory paths,
because llvm-config always refers to the host binary, while
the cmake directory is for the target triple.
This commit is contained in:
Nikita Popov 2022-12-20 17:07:04 +01:00
parent 1286d98278
commit 59b3157c45
7 changed files with 58 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/bootstrap/bin/llvm-config-wrapper.rs
View file

@ -1,24 +0,0 @@
// The sheer existence of this file is an awful hack. See the comments in
// `src/bootstrap/native.rs` for why this is needed when compiling LLD.
use std::env;
use std::io::{self, Write};
use std::process::{self, Command, Stdio};
fn main() {
let real_llvm_config = env::var_os("LLVM_CONFIG_REAL").unwrap();
let mut cmd = Command::new(real_llvm_config);
cmd.args(env::args().skip(1)).stderr(Stdio::piped());
let output = cmd.output().expect("failed to spawn llvm-config");
let mut stdout = String::from_utf8_lossy(&output.stdout);
if let Ok(to_replace) = env::var("LLVM_CONFIG_SHIM_REPLACE") {
if let Ok(replace_with) = env::var("LLVM_CONFIG_SHIM_REPLACE_WITH") {
stdout = stdout.replace(&to_replace, &replace_with).into();
}
}
print!("{}", stdout.replace("\\", "/"));
io::stdout().flush().unwrap();
process::exit(output.status.code().unwrap_or(1));
}