add a few global -> Ref

src/products/executable_generators.jl

@@ -7,18 +7,17 @@ function declare_old_executable_product(product_name)
             return Base.invokelatest(
                 JLLWrappers.withenv_executable_wrapper,
                 f,
-                $(Symbol("$(product_name)_path")),
-                PATH,
-                LIBPATH,
+                $(Symbol("$(product_name)_path"))[],
+                PATH[],
+                LIBPATH[],
                 adjust_PATH,
                 adjust_LIBPATH,
             )
         end
 
-        # This will eventually be replaced with a `Ref{String}`
-        $(path_name) = ""
+        $(path_name) = Ref{String}()
         function $(Symbol(string("get_", product_name, "_path")))()
-            return $(path_name)::String
+            return $(path_name)[]
         end
     end
 end
@@ -34,12 +33,12 @@ function declare_new_executable_product(product_name)
                 env = Base.invokelatest(
                     JLLWrappers.adjust_ENV!,
                     copy(ENV),
-                    PATH,
-                    LIBPATH,
+                    PATH[],
+                    LIBPATH[],
                     adjust_PATH,
                     adjust_LIBPATH,
                 )
-                return Cmd(Cmd([$(path_name)]); env)
+                return Cmd(Cmd([$(path_name)[]]); env)
             end
 
             # Signal to concerned parties that they should use the new version, eventually.
@@ -61,7 +60,7 @@ macro init_executable_product(product_name, product_path)
     path_name = Symbol(string(product_name, "_path"))
     return esc(quote
         # Locate the executable on-disk, store into $(path_name)
-        global $(path_name) = joinpath(artifact_dir, $(product_path))
+        $(path_name)[] = joinpath(artifact_dir, $(product_path))
 
         # Add this executable's directory onto the list of PATH's that we'll need to expose to dependents
         push!(PATH_list, joinpath(artifact_dir, $(dirname(product_path))))

src/toplevel_generators.jl

@@ -83,8 +83,8 @@ function generate_toplevel_definitions(src_name, __source__)
         """
         function is_available end
 
-        PATH = ""
-        LIBPATH = ""
+        const PATH = Ref{String}("")
+        const LIBPATH = Ref{String}("")
         # We put these inter-JLL-package API values here so that they are always defined, even if there
         # is no underlying wrapper held within this JLL package.
         const PATH_list = String[]

src/wrapper_generators.jl

@@ -45,7 +45,7 @@ macro generate_init_footer()
         # Filter out duplicate and empty entries in our PATH and LIBPATH entries
         unique!(PATH_list)
         unique!(LIBPATH_list)
-        global PATH = join(PATH_list, $(pathsep))
-        global LIBPATH = join(vcat(LIBPATH_list, Base.invokelatest(JLLWrappers.get_julia_libpaths)), $(pathsep))
+        PATH[] = join(PATH_list, $(pathsep))
+        LIBPATH[] = join(vcat(LIBPATH_list, Base.invokelatest(JLLWrappers.get_julia_libpaths)), $(pathsep))
     end)
 end

test/runtests.jl

@@ -23,7 +23,7 @@ module TestJLL end
         else
             @test @eval TestJLL HelloWorldC_jll.is_available()
             @test "Hello, World!" == @eval TestJLL hello_world(h->readchomp(`$h`))
-            @test isfile(@eval TestJLL HelloWorldC_jll.hello_world_path)
+            @test isfile(@eval TestJLL HelloWorldC_jll.hello_world_path[])
             @test isfile(@eval TestJLL HelloWorldC_jll.get_hello_world_path())
             @test isdir(@eval TestJLL HelloWorldC_jll.artifact_dir)
         end