Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

preload base/userimg.jl if it exists.

  • Loading branch information...
commit 78e34ebb1bf199ef11aa887e111afff685cc0ba0 1 parent bcc16c4
@StefanKarpinski StefanKarpinski authored
Showing with 3 additions and 0 deletions.
  1. +1 −0  base/.gitignore
  2. +2 −0  base/sysimg.jl
View
1  base/.gitignore
@@ -5,3 +5,4 @@
/file_constants.jl
/uv_constants.jl
/version_git.jl
+/userimg.jl
View
2  base/sysimg.jl
@@ -246,3 +246,5 @@ begin
end
end # baremodule Base
+
+Base.isfile("userimg.jl") && Base.include("userimg.jl")
@Keno Owner
Keno added a note

I believe this needs to be Core.include to avoid #6657

@Keno Owner
Keno added a note

@JeffBezanson could you confirm?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

5 comments on commit 78e34eb

@timholy
Owner

I have a version of this locally too; one thing I've noticed is that (currently at least, and maybe long-term) we would benefit from a make bare to build a version of Julia that doesn't include userimg.jl. This is not something I currently know how to implement, but perhaps it could just temporarily rename userimg.jl and then change it back after the build is done?

@StefanKarpinski

Hmm. That's a pretty hacky way to do this. I'm hoping that we can have a better, more general and robust system for preloading things soon. For now I think this will have to do. Was your version significantly different? It was actually rather hard to figure out something here that worked at all. This bootstrapping stuff is so fragile.

@timholy
Owner

Other than me not realizing that base/ has its own .gitignore, it was identical.

@staticfloat

make bare is easy; just export JULIA_MAKE_BARE=1 in the makefile shell, then inside Julia's sysimg.jl file put get( ENV, "JULIA_MAKE_BARE", "") != "1" or similar in an if statement around these include functions.

@staticfloat

......wow, just realized that this is really old. I guess Keno's comments above tricked my brain into thinking that this was something being actively discussed. Ignore me! :P

Please sign in to comment.
Something went wrong with that request. Please try again.