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

Adding target_rustcflags to TargetCfg

Browse source
This commit is contained in:
Andrew Pollack 2022-09-28 21:32:02 +00:00
parent 09ae7846a2
commit 2f172b4f0b
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/tools/compiletest/src/common.rs
View file

@ -385,7 +385,8 @@ impl Config {
}
fn target_cfg(&self) -> &TargetCfg {
self.target_cfg.borrow_with(|| TargetCfg::new(&self.rustc_path, &self.target))
self.target_cfg
.borrow_with(|| TargetCfg::new(&self.rustc_path, &self.target, &self.target_rustcflags))
}
pub fn matches_arch(&self, arch: &str) -> bool {
@ -456,11 +457,12 @@ pub enum Endian {
}
impl TargetCfg {
fn new(rustc_path: &Path, target: &str) -> TargetCfg {
fn new(rustc_path: &Path, target: &str, target_rustcflags: &Option<String>) -> TargetCfg {
let output = match Command::new(rustc_path)
.arg("--print=cfg")
.arg("--target")
.arg(target)
.args(target_rustcflags.into_iter().map(|s| s.split_whitespace()).flatten())
.output()
{
Ok(output) => output,