mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correctly handle cargo_target_dir

Browse Source
This commit is contained in:
Guillaume Gomez 2024-03-06 16:23:50 +01:00
parent 42569283a2
commit 4bcaa4fe39
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compiler/rustc_codegen_gcc/build_system/src/config.rs
View File

@ -446,9 +446,7 @@ impl ConfigInfo {
)); ));
let ld_library_path = format!( let ld_library_path = format!(
"{target}:{sysroot}:{gcc_path}", "{target}:{sysroot}:{gcc_path}",
// FIXME: It's possible to pick another out directory. Would be nice to have a command target = self.cargo_target_dir,
// line option to change it.
target = current_dir.join("target/out").display(),
sysroot = sysroot.display(), sysroot = sysroot.display(),
gcc_path = self.gcc_path, gcc_path = self.gcc_path,
); );
@ -473,7 +471,7 @@ impl ConfigInfo {
self.rustc_command.extend_from_slice(&rustflags); self.rustc_command.extend_from_slice(&rustflags);
self.rustc_command.extend_from_slice(&[ self.rustc_command.extend_from_slice(&[
"-L".to_string(), "-L".to_string(),
"crate=target/out".to_string(), format!("crate={}", self.cargo_target_dir),
"--out-dir".to_string(), "--out-dir".to_string(),
self.cargo_target_dir.clone(), self.cargo_target_dir.clone(),
]); ]);