From 2b1d45c11cbe86e21c4d803e510d50b46eef95d2 Mon Sep 17 00:00:00 2001 From: Takafumi Arakaki Date: Fri, 2 Nov 2018 17:44:23 -0700 Subject: [PATCH 1/3] Include path to system image in package_slug --- base/loading.jl | 1 + 1 file changed, 1 insertion(+) diff --git a/base/loading.jl b/base/loading.jl index a4a40300c97c6..9a32ad1228b04 100644 --- a/base/loading.jl +++ b/base/loading.jl @@ -135,6 +135,7 @@ end function package_slug(uuid::UUID, p::Int=5) crc = _crc32c(uuid) + crc = _crc32c(unsafe_string(JLOptions().image_file), crc) return slug(crc, p) end From fa5f1b178fa80bf31d6723a7d734b296e990cc06 Mon Sep 17 00:00:00 2001 From: Takafumi Arakaki Date: Thu, 24 Oct 2019 14:47:39 -0700 Subject: [PATCH 2/3] Include path to julia binary in package_slug --- base/loading.jl | 1 + 1 file changed, 1 insertion(+) diff --git a/base/loading.jl b/base/loading.jl index 9a32ad1228b04..6acd04b396dee 100644 --- a/base/loading.jl +++ b/base/loading.jl @@ -136,6 +136,7 @@ end function package_slug(uuid::UUID, p::Int=5) crc = _crc32c(uuid) crc = _crc32c(unsafe_string(JLOptions().image_file), crc) + crc = _crc32c(unsafe_string(JLOptions().julia_bin), crc) return slug(crc, p) end From 7a27601a31d011650ea7e926697137c9c7fc9be4 Mon Sep 17 00:00:00 2001 From: Takafumi Arakaki Date: Mon, 28 Oct 2019 10:22:45 -0700 Subject: [PATCH 3/3] Mix `image_file` and `julia_bin` into project slug --- base/loading.jl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/base/loading.jl b/base/loading.jl index 6acd04b396dee..a6af16d6281ea 100644 --- a/base/loading.jl +++ b/base/loading.jl @@ -135,8 +135,6 @@ end function package_slug(uuid::UUID, p::Int=5) crc = _crc32c(uuid) - crc = _crc32c(unsafe_string(JLOptions().image_file), crc) - crc = _crc32c(unsafe_string(JLOptions().julia_bin), crc) return slug(crc, p) end @@ -1193,7 +1191,10 @@ function compilecache_path(pkg::PkgId)::String if pkg.uuid === nothing abspath(cachepath, entryfile) * ".ji" else - project_precompile_slug = slug(_crc32c(something(Base.active_project(), "")), 5) + crc = _crc32c(something(Base.active_project(), "")) + crc = _crc32c(unsafe_string(JLOptions().image_file), crc) + crc = _crc32c(unsafe_string(JLOptions().julia_bin), crc) + project_precompile_slug = slug(crc, 5) abspath(cachepath, string(entryfile, "_", project_precompile_slug, ".ji")) end end