girlbossceo-archive/hardened_malloc-rs
1
0
Fork 0
mirror of https://github.com/girlbossceo/hardened_malloc-rs.git synced 2025-04-29 14:19:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove unnecessary linker check since we're only using generic ld

Browse source 
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-04-11 00:01:04 -04:00
parent 0b4f3d9d94
commit 18e13b80ed
1 changed files with 5 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
build.rs
View file

@ -26,7 +26,7 @@ fn update_submodules() {
} }
} }
fn check_compiler_and_linker(compiler: &'static str, linker: &'static str) -> (&'static str, &'static str) { fn check_compiler(compiler: &'static str) -> &'static str {
println!("checking if compiler {compiler} exists"); println!("checking if compiler {compiler} exists");
let compiler_ret = Command::new(compiler).arg("--version").status(); let compiler_ret = Command::new(compiler).arg("--version").status();
@ -38,22 +38,7 @@ fn check_compiler_and_linker(compiler: &'static str, linker: &'static str) -> (&
Err(e) => panic!("compiler check failed with error: {e}"), Err(e) => panic!("compiler check failed with error: {e}"),
} }
println!("checking if linker {linker} exists"); compiler
let linker_ret = Command::new(linker).arg("--version").status();
match linker_ret.map(|status| (status.success(), status.code())) {
Ok((true, _)) => println!("linker check exited successfully"),
Ok((false, Some(exit_code))) => {
if exit_code == 1 {
println!("linker check exited with exit code 1, assuming it's available");
}
},
Ok((false, None)) => panic!("linker check exited with no error code, possibly killed by system"),
Err(e) => panic!("linker check failed with error: {e}"),
}
(compiler, linker)
} }
fn main() { fn main() {
@ -91,10 +76,10 @@ fn main() {
update_submodules(); update_submodules();
} }
let (compiler, _linker) = if cfg!(feature = "gcc") { let compiler = if cfg!(feature = "gcc") {
check_compiler_and_linker("gcc", "ld") check_compiler("gcc")
} else { } else {
check_compiler_and_linker("clang", "ld") check_compiler("clang")
}; };
// "default" is hardened_malloc's default.mk. this crate's feature uses // "default" is hardened_malloc's default.mk. this crate's feature uses