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

fix: migrated to use of dynamic library

Browse source
This commit is contained in:
Evan Huff 2024-04-08 16:46:26 -04:00 • committed by June
parent 3243c882df
commit d5d6a52ef7
2 changed files with 7 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
build.rs
View file

@ -53,6 +53,9 @@ fn check_compiler(compiler: &str) {
}
fn main() {
#[cfg(all(feature = "gcc", feature="clang"))]
compile_error!("gcc OR clang must be enabled, not both.");
println!("cargo:rerun-if-changed=build.rs");
println!("cargo:rerun-if-changed=src/hardened_malloc/");
println!("cargo:rerun-if-changed=src/hardened_malloc/.git");
@ -112,45 +115,6 @@ fn main() {
);
}
let ar_lib_output = if cfg!(feature = "light") {
out_dir.clone() + "/libhardened_malloc-light.a"
} else {
out_dir.clone() + "/libhardened_malloc.a"
};
// TOOD: improve this
let ar_args = [
"rcs".to_owned(),
ar_lib_output,
out_dir.clone() + "/chacha.o",
out_dir.clone() + "/h_malloc.o",
out_dir.clone() + "/memory.o",
out_dir.clone() + "/new.o",
out_dir.clone() + "/pages.o",
out_dir.clone() + "/random.o",
out_dir.clone() + "/util.o",
];
let mut ar_command = Command::new("ar");
println!("running {:?} with args {:?}", ar_command, ar_args);
let ar_output = ar_command
.args(ar_args)
.output()
.unwrap_or_else(|error| {
panic!("[hardened_malloc-sys]: Failed to run 'ar {}': ", error);
});
if !ar_output.status.success() {
panic!(
"[hardened_malloc-sys]: creating static lib of hardened_malloc failed:\n{:?}\n{}\n{}",
ar_command,
String::from_utf8_lossy(&ar_output.stdout),
String::from_utf8_lossy(&ar_output.stderr)
);
}
println!(
"[hardened_malloc-sys]: current working directory: {}",
current_working_directory.display()
@ -159,10 +123,10 @@ fn main() {
println!("[hardened_malloc-sys]: OUT_DIR={}", out_dir);
if cfg!(feature = "light") {
println!("cargo:rustc-link-lib=static=hardened_malloc-light");
println!("cargo:rustc-link-lib=dylib=hardened_malloc-light");
println!("cargo:rustc-link-search={}", out_dir);
} else {
println!("cargo:rustc-link-lib=static=hardened_malloc");
println!("cargo:rustc-link-lib=dylib=hardened_malloc");
println!("cargo:rustc-link-search={}", out_dir);
}
}
}

2
tests/Cargo.toml
View file

@ -6,4 +6,4 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
hardened_malloc-sys = { path = "..", features = ["gcc"]}
hardened_malloc-sys = { path = "..", features = ["clang"]}