Merge pull request JuliaLang#39531 from JuliaLang/kc/const_jll

make some variables in jlls const
inkydragon · Feb 7, 2021 · 1e54419 · 1e54419
2 parents 59808cb + ec3173f
commit 1e54419
Show file tree

Hide file tree

Showing 20 changed files with 59 additions and 59 deletions.
diff --git a/stdlib/CompilerSupportLibraries_jll/src/CompilerSupportLibraries_jll.jl b/stdlib/CompilerSupportLibraries_jll/src/CompilerSupportLibraries_jll.jl
@@ -12,8 +12,8 @@ const LIBPATH_list = String[]
 export libgfortran, libstdcxx, libgomp
 
 # These get calculated in __init__()
-PATH = Ref("")
-LIBPATH = Ref("")
+const PATH = Ref("")
+const LIBPATH = Ref("")
 artifact_dir = ""
 libgfortran_handle = C_NULL
 libgfortran_path = ""
@@ -57,7 +57,7 @@ function __init__()
  global libgomp_handle = dlopen(libgomp)
  global libgomp_path = dlpath(libgomp_handle)
  global artifact_dir = dirname(Sys.BINDIR)
- global LIBPATH[] = dirname(libgcc_s_path)
+ LIBPATH[] = dirname(libgcc_s_path)
  push!(LIBPATH_list, LIBPATH[])
 end
 

diff --git a/stdlib/GMP_jll/src/GMP_jll.jl b/stdlib/GMP_jll/src/GMP_jll.jl
@@ -11,8 +11,8 @@ const LIBPATH_list = String[]
 export libgmp, libgmpxx
 
 # These get calculated in __init__()
-PATH = Ref("")
-LIBPATH = Ref("")
+const PATH = Ref("")
+const LIBPATH = Ref("")
 artifact_dir = ""
 libgmp_handle = C_NULL
 libgmp_path = ""
@@ -36,7 +36,7 @@ function __init__()
  global libgmpxx_handle = dlopen(libgmpxx)
  global libgmpxx_path = dlpath(libgmpxx_handle)
  global artifact_dir = dirname(Sys.BINDIR)
- global LIBPATH[] = dirname(libgmp_path)
+ LIBPATH[] = dirname(libgmp_path)
  push!(LIBPATH_list, LIBPATH[])
 end
 

diff --git a/stdlib/LibCURL_jll/src/LibCURL_jll.jl b/stdlib/LibCURL_jll/src/LibCURL_jll.jl
@@ -12,8 +12,8 @@ const LIBPATH_list = String[]
 export libcurl
 
 # These get calculated in __init__()
-PATH = Ref("")
-LIBPATH = Ref("")
+const PATH = Ref("")
+const LIBPATH = Ref("")
 artifact_dir = ""
 libcurl_handle = C_NULL
 libcurl_path = ""
@@ -30,7 +30,7 @@ function __init__()
  global libcurl_handle = dlopen(libcurl)
  global libcurl_path = dlpath(libcurl_handle)
  global artifact_dir = dirname(Sys.BINDIR)
- global LIBPATH[] = dirname(libcurl_path)
+ LIBPATH[] = dirname(libcurl_path)
  push!(LIBPATH_list, LIBPATH[])
 end
 

diff --git a/stdlib/LibGit2_jll/src/LibGit2_jll.jl b/stdlib/LibGit2_jll/src/LibGit2_jll.jl
@@ -12,8 +12,8 @@ const LIBPATH_list = String[]
 export libgit2
 
 # These get calculated in __init__()
-PATH = Ref("")
-LIBPATH = Ref("")
+const PATH = Ref("")
+const LIBPATH = Ref("")
 artifact_dir = ""
 libgit2_handle = C_NULL
 libgit2_path = ""
@@ -30,7 +30,7 @@ function __init__()
  global libgit2_handle = dlopen(libgit2)
  global libgit2_path = dlpath(libgit2_handle)
  global artifact_dir = dirname(Sys.BINDIR)
- global LIBPATH[] = dirname(libgit2_path)
+ LIBPATH[] = dirname(libgit2_path)
  push!(LIBPATH_list, LIBPATH[])
 end
 

diff --git a/stdlib/LibOSXUnwind_jll/src/LibOSXUnwind_jll.jl b/stdlib/LibOSXUnwind_jll/src/LibOSXUnwind_jll.jl
@@ -12,8 +12,8 @@ const LIBPATH_list = String[]
 export libosxunwind
 
 # These get calculated in __init__()
-PATH = Ref("")
-LIBPATH = Ref("")
+const PATH = Ref("")
+const LIBPATH = Ref("")
 artifact_dir = ""
 libosxunwind_handle = C_NULL
 libosxunwind_path = ""
@@ -26,7 +26,7 @@ function __init__()
  global libosxunwind_handle = dlopen(libosxunwind)
  global libosxunwind_path = dlpath(libosxunwind_handle)
  global artifact_dir = dirname(Sys.BINDIR)
- global LIBPATH[] = dirname(libosxunwind_path)
+ LIBPATH[] = dirname(libosxunwind_path)
  push!(LIBPATH_list, LIBPATH[])
  end
 end

diff --git a/stdlib/LibSSH2_jll/src/LibSSH2_jll.jl b/stdlib/LibSSH2_jll/src/LibSSH2_jll.jl
@@ -12,8 +12,8 @@ const LIBPATH_list = String[]
 export libssh2
 
 # These get calculated in __init__()
-PATH = Ref("")
-LIBPATH = Ref("")
+const PATH = Ref("")
+const LIBPATH = Ref("")
 artifact_dir = ""
 libssh2_handle = C_NULL
 libssh2_path = ""
@@ -30,7 +30,7 @@ function __init__()
  global libssh2_handle = dlopen(libssh2)
  global libssh2_path = dlpath(libssh2_handle)
  global artifact_dir = dirname(Sys.BINDIR)
- global LIBPATH[] = dirname(libssh2_path)
+ LIBPATH[] = dirname(libssh2_path)
  push!(LIBPATH_list, LIBPATH[])
 end
 

diff --git a/stdlib/LibUV_jll/src/LibUV_jll.jl b/stdlib/LibUV_jll/src/LibUV_jll.jl
@@ -12,8 +12,8 @@ const LIBPATH_list = String[]
 export libuv
 
 # These get calculated in __init__()
-PATH = Ref("")
-LIBPATH = Ref("")
+const PATH = Ref("")
+const LIBPATH = Ref("")
 artifact_dir = ""
 libuv_handle = C_NULL
 libuv_path = ""
@@ -30,7 +30,7 @@ function __init__()
  global libuv_handle = dlopen(libuv)
  global libuv_path = dlpath(libuv_handle)
  global artifact_dir = dirname(Sys.BINDIR)
- global LIBPATH[] = dirname(libuv_path)
+ LIBPATH[] = dirname(libuv_path)
  push!(LIBPATH_list, LIBPATH[])
 end
 

diff --git a/stdlib/LibUnwind_jll/src/LibUnwind_jll.jl b/stdlib/LibUnwind_jll/src/LibUnwind_jll.jl
@@ -12,8 +12,8 @@ const LIBPATH_list = String[]
 export libunwind
 
 # These get calculated in __init__()
-PATH = Ref("")
-LIBPATH = Ref("")
+const PATH = Ref("")
+const LIBPATH = Ref("")
 artifact_dir = ""
 libunwind_handle = C_NULL
 libunwind_path = ""
@@ -26,7 +26,7 @@ function __init__()
  global libunwind_handle = dlopen(libunwind)
  global libunwind_path = dlpath(libunwind_handle)
  global artifact_dir = dirname(Sys.BINDIR)
- global LIBPATH[] = dirname(libunwind_path)
+ LIBPATH[] = dirname(libunwind_path)
  push!(LIBPATH_list, LIBPATH[])
  end
 end

diff --git a/stdlib/MPFR_jll/src/MPFR_jll.jl b/stdlib/MPFR_jll/src/MPFR_jll.jl
@@ -11,8 +11,8 @@ const LIBPATH_list = String[]
 export libmpfr
 
 # These get calculated in __init__()
-PATH = Ref("")
-LIBPATH = Ref("")
+const PATH = Ref("")
+const LIBPATH = Ref("")
 artifact_dir = ""
 libmpfr_handle = C_NULL
 libmpfr_path = ""
@@ -29,7 +29,7 @@ function __init__()
  global libmpfr_handle = dlopen(libmpfr)
  global libmpfr_path = dlpath(libmpfr_handle)
  global artifact_dir = dirname(Sys.BINDIR)
- global LIBPATH[] = dirname(libmpfr_path)
+ LIBPATH[] = dirname(libmpfr_path)
  push!(LIBPATH_list, LIBPATH[])
 end
 

diff --git a/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl b/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl
@@ -12,8 +12,8 @@ const LIBPATH_list = String[]
 export libmbedcrypto, libmbedtls, libmbedx509
 
 # These get calculated in __init__()
-PATH = Ref("")
-LIBPATH = Ref("")
+const PATH = Ref("")
+const LIBPATH = Ref("")
 artifact_dir = ""
 libmbedcrypto_handle = C_NULL
 libmbedcrypto_path = ""
@@ -44,7 +44,7 @@ function __init__()
  global libmbedx509_handle = dlopen(libmbedx509)
  global libmbedx509_path = dlpath(libmbedx509_handle)
  global artifact_dir = dirname(Sys.BINDIR)
- global LIBPATH[] = dirname(libmbedtls_path)
+ LIBPATH[] = dirname(libmbedtls_path)
  push!(LIBPATH_list, LIBPATH[])
 end
 

diff --git a/stdlib/MozillaCACerts_jll/src/MozillaCACerts_jll.jl b/stdlib/MozillaCACerts_jll/src/MozillaCACerts_jll.jl
@@ -10,8 +10,8 @@ const PATH_list = String[]
 const LIBPATH_list = String[]
 
 # These get calculated in __init__()
-PATH = Ref("")
-LIBPATH = Ref("")
+const PATH = Ref("")
+const LIBPATH = Ref("")
 artifact_dir = ""
 cacert = ""
 

diff --git a/stdlib/OpenBLAS_jll/src/OpenBLAS_jll.jl b/stdlib/OpenBLAS_jll/src/OpenBLAS_jll.jl
@@ -11,8 +11,8 @@ const LIBPATH_list = String[]
 export libopenblas
 
 # These get calculated in __init__()
-PATH = Ref("")
-LIBPATH = Ref("")
+const PATH = Ref("")
+const LIBPATH = Ref("")
 artifact_dir = ""
 libopenblas_handle = C_NULL
 libopenblas_path = ""
@@ -35,7 +35,7 @@ function __init__()
  global libopenblas_handle = dlopen(libopenblas)
  global libopenblas_path = dlpath(libopenblas_handle)
  global artifact_dir = dirname(Sys.BINDIR)
- global LIBPATH[] = dirname(libopenblas_path)
+ LIBPATH[] = dirname(libopenblas_path)
  push!(LIBPATH_list, LIBPATH[])
 end
 

diff --git a/stdlib/OpenLibm_jll/src/OpenLibm_jll.jl b/stdlib/OpenLibm_jll/src/OpenLibm_jll.jl
@@ -11,8 +11,8 @@ const LIBPATH_list = String[]
 export libopenlibm
 
 # These get calculated in __init__()
-PATH = Ref("")
-LIBPATH = Ref("")
+const PATH = Ref("")
+const LIBPATH = Ref("")
 artifact_dir = ""
 libopenlibm_handle = C_NULL
 libopenlibm_path = ""
@@ -29,7 +29,7 @@ function __init__()
  global libopenlibm_handle = dlopen(libopenlibm)
  global libopenlibm_path = dlpath(libopenlibm_handle)
  global artifact_dir = dirname(Sys.BINDIR)
- global LIBPATH[] = dirname(libopenlibm_path)
+ LIBPATH[] = dirname(libopenlibm_path)
  push!(LIBPATH_list, LIBPATH[])
 end
 

diff --git a/stdlib/PCRE2_jll/src/PCRE2_jll.jl b/stdlib/PCRE2_jll/src/PCRE2_jll.jl
@@ -11,8 +11,8 @@ const LIBPATH_list = String[]
 export libpcre2_8
 
 # These get calculated in __init__()
-PATH = Ref("")
-LIBPATH = Ref("")
+const PATH = Ref("")
+const LIBPATH = Ref("")
 artifact_dir = ""
 libpcre2_8_handle = C_NULL
 libpcre2_8_path = ""
@@ -29,7 +29,7 @@ function __init__()
  global libpcre2_8_handle = dlopen(libpcre2_8)
  global libpcre2_8_path = dlpath(libpcre2_8_handle)
  global artifact_dir = dirname(Sys.BINDIR)
- global LIBPATH[] = dirname(libpcre2_8_path)
+ LIBPATH[] = dirname(libpcre2_8_path)
  push!(LIBPATH_list, LIBPATH[])
 end
 

diff --git a/stdlib/SuiteSparse_jll/src/SuiteSparse_jll.jl b/stdlib/SuiteSparse_jll/src/SuiteSparse_jll.jl
@@ -12,8 +12,8 @@ export libamd, libbtf, libcamd, libccolamd, libcholmod, libcolamd, libklu, libld
 
 # These get calculated in __init__()
 # Man I can't wait until these are automatically handled by an in-Base JLLWrappers clone.
-PATH = Ref("")
-LIBPATH = Ref("")
+const PATH = Ref("")
+const LIBPATH = Ref("")
 artifact_dir = ""
 libamd_handle = C_NULL
 libamd_path = ""
@@ -114,7 +114,7 @@ function __init__()
  global libumfpack_handle = dlopen(libumfpack)
  global libumfpack_path = dlpath(libumfpack_handle)
  global artifact_dir = dirname(Sys.BINDIR)
- global LIBPATH[] = dirname(libsuitesparse_wrapper_path)
+ LIBPATH[] = dirname(libsuitesparse_wrapper_path)
  push!(LIBPATH_list, LIBPATH[])
 end
 

diff --git a/stdlib/Zlib_jll/src/Zlib_jll.jl b/stdlib/Zlib_jll/src/Zlib_jll.jl
@@ -11,8 +11,8 @@ const LIBPATH_list = String[]
 export libz
 
 # These get calculated in __init__()
-PATH = Ref("")
-LIBPATH = Ref("")
+const PATH = Ref("")
+const LIBPATH = Ref("")
 artifact_dir = ""
 libz_handle = C_NULL
 libz_path = ""
@@ -29,7 +29,7 @@ function __init__()
  global libz_handle = dlopen(libz)
  global libz_path = dlpath(libz_handle)
  global artifact_dir = dirname(Sys.BINDIR)
- global LIBPATH[] = dirname(libz_path)
+ LIBPATH[] = dirname(libz_path)
  push!(LIBPATH_list, LIBPATH[])
 end
 

diff --git a/stdlib/dSFMT_jll/src/dSFMT_jll.jl b/stdlib/dSFMT_jll/src/dSFMT_jll.jl
@@ -12,8 +12,8 @@ const LIBPATH_list = String[]
 export libdSFMT
 
 # These get calculated in __init__()
-PATH = Ref("")
-LIBPATH = Ref("")
+const PATH = Ref("")
+const LIBPATH = Ref("")
 artifact_dir = ""
 libdSFMT_handle = C_NULL
 libdSFMT_path = ""
@@ -30,7 +30,7 @@ function __init__()
  global libdSFMT_handle = dlopen(libdSFMT)
  global libdSFMT_path = dlpath(libdSFMT_handle)
  global artifact_dir = dirname(Sys.BINDIR)
- global LIBPATH[] = dirname(libdSFMT_path)
+ LIBPATH[] = dirname(libdSFMT_path)
  push!(LIBPATH_list, LIBPATH[])
 end
 

diff --git a/stdlib/libLLVM_jll/src/libLLVM_jll.jl b/stdlib/libLLVM_jll/src/libLLVM_jll.jl
@@ -12,8 +12,8 @@ const LIBPATH_list = String[]
 export libLLVM
 
 # These get calculated in __init__()
-PATH = Ref("")
-LIBPATH = Ref("")
+const PATH = Ref("")
+const LIBPATH = Ref("")
 artifact_dir = ""
 libLLVM_handle = C_NULL
 libLLVM_path = ""
@@ -30,7 +30,7 @@ function __init__()
  global libLLVM_handle = dlopen(libLLVM)
  global libLLVM_path = dlpath(libLLVM_handle)
  global artifact_dir = dirname(Sys.BINDIR)
- global LIBPATH[] = dirname(libLLVM_path)
+ LIBPATH[] = dirname(libLLVM_path)
  push!(LIBPATH_list, LIBPATH[])
 end
 

diff --git a/stdlib/nghttp2_jll/src/nghttp2_jll.jl b/stdlib/nghttp2_jll/src/nghttp2_jll.jl
@@ -11,8 +11,8 @@ const LIBPATH_list = String[]
 export libnghttp2
 
 # These get calculated in __init__()
-PATH = Ref("")
-LIBPATH = Ref("")
+const PATH = Ref("")
+const LIBPATH = Ref("")
 artifact_dir = ""
 libnghttp2_handle = C_NULL
 libnghttp2_path = ""
@@ -29,7 +29,7 @@ function __init__()
  global libnghttp2_handle = dlopen(libnghttp2)
  global libnghttp2_path = dlpath(libnghttp2_handle)
  global artifact_dir = dirname(Sys.BINDIR)
- global LIBPATH[] = dirname(libnghttp2_path)
+ LIBPATH[] = dirname(libnghttp2_path)
  push!(LIBPATH_list, LIBPATH[])
 end
 

diff --git a/stdlib/p7zip_jll/src/p7zip_jll.jl b/stdlib/p7zip_jll/src/p7zip_jll.jl
@@ -11,8 +11,8 @@ const LIBPATH_list = String[]
 export p7zip
 
 # These get calculated in __init__()
-PATH = Ref("")
-LIBPATH = Ref("")
+const PATH = Ref("")
+const LIBPATH = Ref("")
 artifact_dir = ""
 p7zip_path = ""
 if Sys.iswindows()
@@ -83,7 +83,7 @@ end
 function __init__()
  global artifact_dir = dirname(Sys.BINDIR)
  init_p7zip_path()
- global PATH[] = dirname(p7zip_path)
+ PATH[] = dirname(p7zip_path)
  push!(PATH_list, PATH[])
 end