Merge pull request #63 from aleon1138/bugfix/fix_static_compilation_linux

termoshtt · web-flow · commit 4de956829738 · 2022-07-30T15:23:36.000+09:00
Added path for libiomp5 static libraries under /opt/intel
diff --git a/intel-mkl-tool/src/entry.rs b/intel-mkl-tool/src/entry.rs
@@ -108,10 +108,11 @@ impl Entry {
             }
         }
 
-        // /opt/intel/mkl
-        let opt_mkl = PathBuf::from("/opt/intel/mkl");
+        // /opt/intel
+        let opt_mkl = PathBuf::from("/opt/intel");
         if opt_mkl.exists() {
             targets.seek(opt_mkl.join("lib/intel64"));
+            targets.seek(opt_mkl.join("mkl/lib/intel64"));
         }
 
         // Default setting for Windows installer

Original file line number	Diff line number	Diff line change
`@@ -108,10 +108,11 @@ impl Entry {`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`
`111`		`- // /opt/intel/mkl`
`112`		`- let opt_mkl = PathBuf::from("/opt/intel/mkl");`
	`111`	`+ // /opt/intel`
	`112`	`+ let opt_mkl = PathBuf::from("/opt/intel");`
`113`	`113`	`if opt_mkl.exists() {`
`114`	`114`	`targets.seek(opt_mkl.join("lib/intel64"));`
	`115`	`+ targets.seek(opt_mkl.join("mkl/lib/intel64"));`
`115`	`116`	`}`
`116`	`117`
`117`	`118`	`// Default setting for Windows installer`