From aac4a25d5a78a7149b2b16358a39e03123ffb58a Mon Sep 17 00:00:00 2001 From: strawberry Date: Sun, 12 Nov 2023 19:59:55 -0500 Subject: [PATCH] add missing rustc library links Signed-off-by: strawberry --- build.rs | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/build.rs b/build.rs index c933caf..8105596 100644 --- a/build.rs +++ b/build.rs @@ -30,6 +30,10 @@ fn update_submodules() { } fn main() { + //println!("cargo:rerun-if-changed=build.rs"); + println!("cargo:rerun-if-changed=src/hardened_malloc/"); + //println!("cargo:out_dir={}", env::var("OUT_DIR").unwrap()); + if !Path::new("src/hardened_malloc/Makefile").exists() { println!("src/hardened_malloc/Makefile does not exist, running submodule sync"); update_submodules(); @@ -64,9 +68,23 @@ fn main() { ); } - //println!("cargo:rustc-link-search=native=src/hardened_malloc"); + //std::env::set_var("OUT_DIR", "$OUT"); - //println!("cargo:rerun-if-changed=build.rs"); - println!("cargo:rerun-if-changed=src/hardened_malloc/"); - //println!("cargo:out_dir={}", env::var("OUT_DIR").unwrap()); + println!("cargo:include=src/hardened_malloc/include"); + + if cfg!(feature = "light") { + //println!("cargo:rustc-link-lib=static=src/hardened_malloc/out-light/libhardened_malloc-light.so"); + println!( + "cargo:rustc-link-lib=dylib=src/hardened_malloc/out-light/libhardened_malloc-light.so" + ); + println!("cargo:lib=src/hardened_malloc/out-light/libhardened_malloc-light.so"); + //println!("cargo:rustc-link-lib=static=libhardened_malloc-light"); + println!("cargo:rustc-link-search=native=src/hardened_malloc/out-light/"); + } else { + //println!("cargo:rustc-link-lib=static=src/hardened_malloc/out/libhardened_malloc.so"); + println!("cargo:rustc-link-lib=dylib=src/hardened_malloc/out/libhardened_malloc.so"); + println!("cargo:lib=src/hardened_malloc/out/libhardened_malloc.so"); + //println!("cargo:rustc-link-lib=static=libhardened_malloc"); + println!("cargo:rustc-link-search=native=src/hardened_malloc/out/"); + } }