yggdrasil/ring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ret PathBuf instead of String for fn compile

Browse Source 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
Jiahao XU 2023-01-28 12:49:06 +11:00 committed by Brian Smith
parent a65da9d260
commit d949e6ffc7
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build.rs
View File

@ -545,10 +545,16 @@ fn build_library(
println!("cargo:rustc-link-lib=static={}", lib_name); println!("cargo:rustc-link-lib=static={}", lib_name);
} }
fn compile(b: &cc::Build, p: &Path, target: &Target, include_dir: &Path, out_dir: &Path) -> String { fn compile(
b: &cc::Build,
p: &Path,
target: &Target,
include_dir: &Path,
out_dir: &Path,
) -> PathBuf {
let ext = p.extension().unwrap().to_str().unwrap(); let ext = p.extension().unwrap().to_str().unwrap();
if ext == "o" { if ext == "o" {
p.to_str().expect("Invalid path").into() p.into()
} else { } else {
let out_file = obj_path(out_dir, p); let out_file = obj_path(out_dir, p);
let cmd = if target.os != WINDOWS || ext != "asm" { let cmd = if target.os != WINDOWS || ext != "asm" {
@ -558,7 +564,7 @@ fn compile(b: &cc::Build, p: &Path, target: &Target, include_dir: &Path, out_dir
}; };
run_command(cmd); run_command(cmd);
out_file.to_str().expect("Invalid path").into() out_file
} }
} }