Properly link the library

Author: gnzlbg

crates/libm-cdylib/src/test_utils.rs

@@ -45,6 +45,12 @@ pub(crate) fn compile_file(src_path: &Path, bin_path: &Path) {
         .arg("-o")
         .arg(bin_path)
         .arg(src_path);
+
+    // Link our libm
+    let lib_path = cdylib_dir();
+    cmd.arg(format!("-L{}", lib_path.display()));
+    cmd.arg("-llibm");
+
     handle_err(
         &format!("compile file: {}", src_path.display()),
         &cmd.output().unwrap(),
@@ -59,25 +65,6 @@ where
 {
     let mut cmd = process::Command::new(path);
 
-    // Find the cdylib - we just support standard locations for now.
-    let libm_path = target_dir().join(if cfg!(release_profile) {
-        "release"
-    } else {
-        "debug"
-    });
-
-    // Replace libm at runtime
-    if cfg!(target_os = "macos") {
-        let lib_path = libm_path.join("liblibm.dylib");
-        // for debugging:
-        // cmd.env("DYLD_PRINT_LIBRARIES", "1");
-        // cmd.env("X", "1");
-        cmd.env("DYLD_FORCE_FLAT_NAMESPACE", "1");
-        cmd.env("DYLD_INSERT_LIBRARIES", lib_path.display().to_string());
-    } else if cfg!(target_os = "linux") {
-        let lib_path = libm_path.join("liblibm.so");
-        cmd.env("LD_PRELOAD", lib_path.display().to_string());
-    }
     // Run the binary:
     let output = cmd.output().unwrap();
     handle_err(&format!("run file: {}", path.display()), &output);
@@ -150,3 +137,22 @@ pub(crate) fn target_dir() -> std::path::PathBuf {
         Path::new("../../target").into()
     }
 }
+
+pub(crate) fn cdylib_dir() -> std::path::PathBuf {
+    target_dir().join(if cfg!(release_profile) {
+        "release"
+    } else {
+        "debug"
+    })
+}
+
+pub(crate) fn cdylib_path() -> std::path::PathBuf {
+    let libm_path = cdylib_dir();
+    if cfg!(target_os = "macos") {
+        libm_path.join("liblibm.dylib")
+    } else if cfg!(target_os = "linux") {
+        libm_path.join("liblibm.so")
+    } else {
+        panic!("unsupported target_os")
+    }
+}