Merge pull request #199 from JunoLab/sp/fixprecomperr

re-use `basepath` for getting path to julia install

Author: pfitzseb

src/utils.jl

@@ -219,7 +219,7 @@ end
 function fixpath(
   filename::AbstractString;
   badpath = basebuilddir,
-  goodpath = juliadir,
+  goodpath = basepath("..")
 )
   startswith(filename, badpath) || return fullpath(normpath(filename)) # NOTE: `fullpath` added when adapted
   filec = filename
@@ -251,35 +251,6 @@ const basebuilddir = let # NOTE: changed from `begin` to `let` when adapted
   dirname(dirname(sysimg))
 end
 
-"""
-    juliadir
-
-Constant specifying full path to julia top-level source directory.
-This should be reliable even for local builds, cross-builds, and binary installs.
-"""
-const juliadir = begin
-  local jldir = basebuilddir
-  if !isdir(joinpath(jldir, "base"))
-        # Binaries probably end up here. We fall back on Sys.BINDIR
-    jldir = joinpath(Sys.BINDIR, Base.DATAROOTDIR, "julia")
-    if !isdir(joinpath(jldir, "base"))
-      while true
-        trydir = joinpath(jldir, "base")
-        isdir(trydir) && break
-        trydir = joinpath(jldir, "share", "julia", "base")
-        if isdir(trydir)
-          jldir = joinpath(jldir, "share", "julia")
-          break
-        end
-        jldirnext = dirname(jldir)
-        jldirnext == jldir && break
-        jldir = jldirnext
-      end
-    end
-  end
-  normpath(jldir)
-end
-
 use_compiled_modules() = Base.JLOptions().use_compiled_modules != 0
 
 # For tracking Julia's own stdlibs