Skip to content

Commit

Permalink
Merge pull request #25 from rust-math/drop_failure
Browse files Browse the repository at this point in the history
Drop failure from intel-mkl-src
  • Loading branch information
termoshtt authored Dec 2, 2019
2 parents e37c781 + f0297ea commit d39afdd
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 8 deletions.
3 changes: 0 additions & 3 deletions intel-mkl-src/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ exclude = ["mkl_lib/mkl.tar.xz"]
default = []
use-shared = []

[build-dependencies]
failure = "0.1"

[build-dependencies.intel-mkl-tool]
version = "0.1.0"
path = "../intel-mkl-tool"
Expand Down
8 changes: 3 additions & 5 deletions intel-mkl-src/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,25 +20,23 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.

use failure::*;
use std::{env, path::*};

fn main() -> Fallible<()> {
fn main() {
let out_dir = if let Some(path) = intel_mkl_tool::seek_pkg_config() {
path
} else {
let out_dir = if cfg!(feature = "use-shared") {
intel_mkl_tool::home_library_path()
} else {
PathBuf::from(env::var("OUT_DIR").unwrap())
PathBuf::from(env::var("OUT_DIR").expect("Failed to get OUT_DIR"))
};

intel_mkl_tool::download(&out_dir)?;
intel_mkl_tool::download(&out_dir).expect("Failed to downalod Intel-MKL archive");
out_dir
};
println!("cargo:rustc-link-search={}", out_dir.display());
println!("cargo:rustc-link-lib=mkl_intel_lp64");
println!("cargo:rustc-link-lib=mkl_sequential");
println!("cargo:rustc-link-lib=mkl_core");
Ok(())
}

0 comments on commit d39afdd

Please sign in to comment.