From ca96911f23bb3af240ca03aaf2e5c295d5d0c5b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mos=C3=A8=20Giordano?= Date: Wed, 4 Dec 2019 20:12:54 +0000 Subject: [PATCH] [MKL] Add IntelOpenMP as dependency --- M/MKL/build_tarballs.jl | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/M/MKL/build_tarballs.jl b/M/MKL/build_tarballs.jl index b5fc38e1f20..499b81611aa 100644 --- a/M/MKL/build_tarballs.jl +++ b/M/MKL/build_tarballs.jl @@ -47,6 +47,7 @@ products = [ # Dependencies that must be installed before this package can be built dependencies = [ + "IntelOpenMP_jll", ] # Install first for win32, then win64. This will accumulate files into `products` and also wrappers into the JLL package. @@ -55,17 +56,17 @@ non_reg_ARGS = filter(arg -> arg != "--register", ARGS) include("../../fancy_toys.jl") if should_build_platform("i686-w64-mingw32") - build_tarballs(non_reg_ARGS, name, version, sources_win32, script, [Windows(:i686)], products, []) + build_tarballs(non_reg_ARGS, name, version, sources_win32, script, [Windows(:i686)], products, dependencies) end if should_build_platform("x86_64-w64-mingw32") - build_tarballs(non_reg_ARGS, name, version, sources_win64, script, [Windows(:x86_64)], products, []) + build_tarballs(non_reg_ARGS, name, version, sources_win64, script, [Windows(:x86_64)], products, dependencies) end if should_build_platform("x86_64-apple-darwin14") - build_tarballs(non_reg_ARGS, name, version, sources_macos, script, [MacOS(:x86_64)], products, []) + build_tarballs(non_reg_ARGS, name, version, sources_macos, script, [MacOS(:x86_64)], products, dependencies) end if should_build_platform("i686-linux-gnu") - build_tarballs(non_reg_ARGS, name, version, sources_linux32, script, [Linux(:i686)], products, []) + build_tarballs(non_reg_ARGS, name, version, sources_linux32, script, [Linux(:i686)], products, dependencies) end if should_build_platform("x86_64-linux-gnu") - build_tarballs(ARGS, name, version, sources_linux64, script, [Linux(:x86_64)], products, []) + build_tarballs(ARGS, name, version, sources_linux64, script, [Linux(:x86_64)], products, dependencies) end