Tweaks

contrib/relative_path.py

@@ -7,8 +7,4 @@
 # shells and whatnot during the build are all POSIX shells/cygwin.  We rely on the build
 # system itself to canonicalize to `\` when it needs to, and deal with the shell escaping
 # and whatnot at the latest possible moment.
-sys.stdout.write(os.path.relpath(sys.argv[2], sys.argv[1]).replace(os.path.sep, '/'))
-
-# Always print a trailing slash if this is a directory
-if os.path.isdir(sys.argv[2]):
-    sys.stdout.write("/")
+sys.stdout.write(os.path.relpath(sys.argv[2], sys.argv[1]).replace(os.path.sep, '/'))

sysimage.mk

@@ -55,7 +55,7 @@ BASE_SRCS := $(sort $(shell find $(JULIAHOME)/base -name \*.jl -and -not -name s
                     $(shell find $(BUILDROOT)/base -name \*.jl  -and -not -name sysimg.jl))
 STDLIB_SRCS := $(JULIAHOME)/base/sysimg.jl $(shell find $(build_datarootdir)/julia/stdlib/$(VERSDIR)/*/src -name \*.jl) \
                     $(build_prefix)/manifest/Pkg
-RELBUILDROOT := $(call rel_path,$(JULIAHOME)/base,$(BUILDROOT)/base)
+RELBUILDROOT := $(call rel_path,$(JULIAHOME)/base,$(BUILDROOT)/base)/ # <-- make sure this always has a trailing slash
 
 $(build_private_libdir)/corecompiler.ji: $(COMPILER_SRCS)
 	@$(call PRINT_JULIA, cd $(JULIAHOME)/base && \

test/precompile.jl

@@ -258,6 +258,7 @@ try
         @test_throws ErrorException Base.read_dependency_src(cachefile, joinpath(dir, "foo.jl"))
 
         modules, deps1 = Base.cache_dependencies(cachefile)
+        stdlib_modules = filter(s -> Base.identify_package(s) !== nothing, readdir(Sys.STDLIB))
         @test Dict(modules) == merge(
             Dict(let m = Base.PkgId(s)
                     m => Base.module_build_id(Base.root_module(m))
@@ -267,7 +268,7 @@ try
             # plus modules included in the system image
             Dict(let m = Base.root_module(Base, s)
                      Base.PkgId(m) => Base.module_build_id(m)
-                 end for s in Symbol.(readdir(Sys.STDLIB))),
+                 end for s in Symbol.(stdlib_modules)),
                 # Plus precompilation module generated at build time
                 let id = Base.PkgId("__PackagePrecompilationStatementModule")
                     Dict(id => Base.module_build_id(Base.root_module(id)))