fixup

Author: gnzlbg

crates/libm-cdylib/src/macros.rs

@@ -47,10 +47,10 @@ macro_rules! export {
                     c_format_s = c_format_s
                 );
 
-                let src = &format!("../../target/{}.c", stringify!($id));
-                let bin = &format!("../../target/{}", stringify!($id));
-                let src_path = std::path::Path::new(src);
-                let bin_path = std::path::Path::new(bin);
+                let target_dir = target_dir();
+                eprintln!("target dir: {}", target_dir.display());
+                let src_path = target_dir.clone().join(format!("{}.c", stringify!($id)));
+                let bin_path = target_dir.clone().join(format!("{}", stringify!($id)));
                 write_to_file(&src_path, &ctest);
 
                 // We now compile the C program into an executable, make sure

crates/libm-cdylib/src/test_utils.rs

@@ -51,29 +51,22 @@ where
     let mut cmd = process::Command::new(path);
 
     // Find the cdylib - we just support standard locations for now.
-    let target_dir = if let Ok(dir) = std::env::var("CARGO_TARGET_DIR") {
-        std::path::PathBuf::from(&dir)
-    } else {
-        Path::new("../../target").into()
-    };
-    let libm_path = target_dir.join(Path::new(if cfg!(release_profile) {
+    let libm_path = target_dir().join(if cfg!(release_profile) {
         "release"
     } else {
         "debug"
-    }));
+    });
 
     // Replace libm at runtime
     if cfg!(target_os = "macos") {
-        let lib_name = format!("liblibm.{}", "dylib");
-        let lib_path = libm_path.join(Path::new(&lib_name));
+        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_name = format!("liblibm.{}", "so");
-        let lib_path = libm_path.join(Path::new(&lib_name));
+        let lib_path = libm_path.join("liblibm.so");
         cmd.env("LD_PRELOAD", lib_path.display().to_string());
     }
     // Run the binary:
@@ -140,3 +133,11 @@ pub(crate) fn ctype_and_printf_format_specifier(x: &str) -> (&str, &str) {
         _ => panic!("unknown type: {}", x),
     }
 }
+
+pub(crate) fn target_dir() -> std::path::PathBuf {
+    if let Ok(dir) = std::env::var("CARGO_TARGET_DIR") {
+        std::path::PathBuf::from(&dir)
+    } else {
+        Path::new("../../target").into()
+    }
+}