From 8edb94e7cfdefa34ba5ab57ac105c688741bf84e Mon Sep 17 00:00:00 2001
From: Yerkebulan Tulibergenov <yerkebulan@gmail.com>
Date: Wed, 13 Jul 2022 22:59:49 -0700
Subject: [PATCH 1/3] add macOS support

---
 .cargo/config |  2 ++
 build.rs      | 60 +++++++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 53 insertions(+), 9 deletions(-)
 create mode 100644 .cargo/config

diff --git a/.cargo/config b/.cargo/config
new file mode 100644
index 000000000..e023582c3
--- /dev/null
+++ b/.cargo/config
@@ -0,0 +1,2 @@
+[target.x86_64-apple-darwin]
+rustflags = ["-C", "link-arg=-Wl,-rpath,/opt/intel/oneapi/compiler/latest/mac/compiler/lib"]
diff --git a/build.rs b/build.rs
index 2f6bdfa80..68e294d40 100644
--- a/build.rs
+++ b/build.rs
@@ -24,7 +24,7 @@
 //! - [x] Linux 32 bit
 //! - [x] Linux 64 bit
 //! - [ ] MacOS 32 bit
-//! - [ ] MacOS 64 bit
+//! - [x] MacOS 64 bit
 
 pub const MKL_VERSION: &str = "2022.1.0";
 pub const STATIC: bool = cfg!(feature = "mkl-static-seq") || cfg!(feature = "mkl-static-iomp");
@@ -37,8 +37,12 @@ pub const LINK_TYPE: &str = if STATIC { "static" } else { "dylib" };
 pub const LIB_POSTFIX: &str = if cfg!(windows) && DYNAMIC { "_dll" } else { "" };
 pub const LD_DIR: &str = if cfg!(windows) {
     "PATH"
-} else {
+} else if cfg!(target_os = "linux") {
     "LD_LIBRARY_PATH"
+} else if cfg!(target_os = "macos") {
+    "DYLD_LIBRARY_PATH"
+} else {
+    ""
 };
 
 pub const DEFAULT_ONEAPI_ROOT: &str = if cfg!(windows) {
@@ -102,6 +106,15 @@ pub const LINK_DIRS: &[&str] = &[
 #[cfg(target_os = "linux")]
 pub const SHARED_LIB_DIRS: &[&str] = LINK_DIRS;
 
+#[cfg(target_os = "macos")]
+const MACOS_COMPILER_PATH: &str = "compiler/latest/mac/compiler/lib";
+
+#[cfg(target_os = "macos")]
+pub const LINK_DIRS: &[&str] = &[MACOS_COMPILER_PATH, "mkl/latest/lib"];
+
+#[cfg(target_os = "macos")]
+pub const SHARED_LIB_DIRS: &[&str] = LINK_DIRS;
+
 #[derive(Debug)]
 pub enum BuildError {
     OneAPINotFound(std::path::PathBuf),
@@ -123,22 +136,37 @@ fn main() -> Result<(), BuildError> {
         let root = std::env::var("ONEAPI_ROOT").unwrap_or_else(|_| DEFAULT_ONEAPI_ROOT.to_string());
         println!("Using '{root}' as ONEAPI_ROOT");
 
-        let path = std::env::var(LD_DIR).map_err(BuildError::PathNotFound)?;
+        let path = match std::env::var(LD_DIR) {
+            Ok(path) => path,
+            Err(e) => {
+                // On macOS it's unusual to set $DYLD_LIBRARY_PATH, so we want to provide a helpful message
+                println!(
+                    "Library path env variable '{LD_DIR}' was not found. Run `{}`",
+                    suggest_setvars_cmd(&root)
+                );
+                return Err(BuildError::PathNotFound(e));
+            }
+        };
 
         if DYNAMIC {
             // check to make sure that things in `SHARED_LIB_DIRS` are in `$LD_DIR`.
             let path = path.replace('\\', "/");
             for shared_lib_dir in SHARED_LIB_DIRS {
+                #[cfg(target_os = "macos")]
+                if *shared_lib_dir == MACOS_COMPILER_PATH {
+                    // on macOS that directory is not set in $DYLD_LIBRARY_PATH, but
+                    // rather we set it with rustflags in .cargo/config
+                    continue;
+                }
+
                 let versioned_dir = shared_lib_dir.replace("latest", MKL_VERSION);
 
                 println!("Checking that '{shared_lib_dir}' or '{versioned_dir}' is in {LD_DIR}");
                 if !path.contains(shared_lib_dir) && !path.contains(&versioned_dir) {
-                    let suggested_cmd = if cfg!(windows) {
-                        format!("{root}/setvars.bat")
-                    } else {
-                        format!("source {root}/setvars.sh")
-                    };
-                    println!("'{shared_lib_dir}' not found in library path. Run `{suggested_cmd}`");
+                    println!(
+                        "'{shared_lib_dir}' not found in library path. Run `{}`",
+                        suggest_setvars_cmd(&root)
+                    );
                     return Err(BuildError::AddSharedLibDirToPath(
                         shared_lib_dir.to_string(),
                     ));
@@ -176,3 +204,17 @@ fn main() -> Result<(), BuildError> {
 
     Ok(())
 }
+
+#[cfg(any(
+    feature = "mkl-static-iomp",
+    feature = "mkl-static-seq",
+    feature = "mkl-dynamic-iomp",
+    feature = "mkl-dynamic-seq"
+))]
+fn suggest_setvars_cmd(root: &str) -> String {
+    if cfg!(windows) {
+        format!("{root}/setvars.bat")
+    } else {
+        format!("source {root}/setvars.sh")
+    }
+}

From 5e828a0c556852ce45ba8035f3e606e2e2c45818 Mon Sep 17 00:00:00 2001
From: Yerkebulan Tulibergenov <yerkebulan@gmail.com>
Date: Wed, 13 Jul 2022 23:09:45 -0700
Subject: [PATCH 2/3] update README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 85d77347c..b359d8ab2 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,7 @@ Linking is currently tested & verified on the following platforms:
 
 - [x] Windows
 - [x] Linux
-- [ ] MacOS (need someone to help me test!)
+- [x] macOS
 
 Example:
 ```toml

From 50f1df4942a7945f98464f24fab62141aba73477 Mon Sep 17 00:00:00 2001
From: Corey Lowman <coreylowman@users.noreply.github.com>
Date: Thu, 14 Jul 2022 07:47:26 -0400
Subject: [PATCH 3/3] Update build.rs

Co-authored-by: Joseph Li <13826851+joseph-x-li@users.noreply.github.com>
---
 build.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build.rs b/build.rs
index 68e294d40..cc00736b9 100644
--- a/build.rs
+++ b/build.rs
@@ -23,7 +23,6 @@
 //! - [x] Windows 64 bit
 //! - [x] Linux 32 bit
 //! - [x] Linux 64 bit
-//! - [ ] MacOS 32 bit
 //! - [x] MacOS 64 bit
 
 pub const MKL_VERSION: &str = "2022.1.0";