From 27f7b75a487648441422a21c6484e787ea1a594c Mon Sep 17 00:00:00 2001 From: Elliot Saba Date: Tue, 10 Nov 2020 22:19:37 +0000 Subject: [PATCH] Precompile all the JLLs --- base/sysimg.jl | 16 +++++++++++++++- stdlib/Makefile | 11 ++--------- stdlib/MbedTLS_jll/src/MbedTLS_jll.jl | 6 +++--- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/base/sysimg.jl b/base/sysimg.jl index 07a1cab887a8d..ace2ee7c0a13e 100644 --- a/base/sysimg.jl +++ b/base/sysimg.jl @@ -54,8 +54,22 @@ let :REPL, :Statistics, :Zlib_jll, - :GMP_jll, + :p7zip_jll, + :dSFMT_jll, + :libLLVM_jll, :MozillaCACerts_jll, + :nghttp2_jll, + :LibUV_jll, + :PCRE2_jll, + :OpenLibm_jll, + :LibOSXUnwind_jll, + :LibUnwind_jll, + :OpenBLAS_jll, + :SuiteSparse_jll, + :MbedTLS_jll, + :LibSSH2_jll, + :GMP_jll, + :MPFR_jll, :LibCURL_jll, :LibCURL, :Downloads, diff --git a/stdlib/Makefile b/stdlib/Makefile index 076854501d462..5395fd393f4b7 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -16,15 +16,8 @@ $(build_datarootdir)/julia/stdlib/$(VERSDIR): JLLS = dSFMT_jll GMP_jll LibCURL_jll LibGit2_jll libLLVM_jll LibSSH2_jll \ LibUV_jll MbedTLS_jll MozillaCACerts_jll MPFR_jll nghttp2_jll \ - OpenBLAS_jll OpenLibm_jll p7zip_jll PCRE2_jll SuiteSparse_jll Zlib_jll - -ifeq ($(OS),Darwin) -JLLS += LibOSXUnwind_jll -endif - -ifneq (,$(filter $(OS), Linux FreeBSD)) -JLLS += LibUnwind_jll -endif + OpenBLAS_jll OpenLibm_jll p7zip_jll PCRE2_jll SuiteSparse_jll Zlib_jll \ + LibOSXUnwind_jll LibUnwind_jll # Define rule to download `Artifacts.toml` file for each JLL we bundle. define download-artifacts-toml diff --git a/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl b/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl index 589a724349c2f..00ab837a29534 100644 --- a/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl +++ b/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl @@ -1,8 +1,8 @@ # This file is a part of Julia. License is MIT: https://julialang.org/license -## dummy stub for https://github.com/JuliaBinaryWrappers/LibMbedTLS_jll.jl +## dummy stub for https://github.com/JuliaBinaryWrappers/MbedTLS_jll.jl -module LibMbedTLS_jll +module MbedTLS_jll using Libdl @@ -42,4 +42,4 @@ function __init__() global libmbedx509_path = dlpath(libmbedx509_handle) end -end # module LibMbedTLS_jll +end # module MbedTLS_jll