diff --git a/base/Base.jl b/base/Base.jl index 4fb29672f35d7..fbc39e8104fba 100644 --- a/base/Base.jl +++ b/base/Base.jl @@ -495,7 +495,7 @@ include(mapexpr::Function, mod::Module, _path::AbstractString) = _include(mapexp # External libraries vendored into Base Core.println("JuliaSyntax/src/JuliaSyntax.jl") -include(@__MODULE__, "JuliaSyntax/src/JuliaSyntax.jl") +include(@__MODULE__, string((length(Core.ARGS)>=2 ? Core.ARGS[2] : ""), "JuliaSyntax/src/JuliaSyntax.jl")) # include($BUILDROOT/base/JuliaSyntax/JuliaSyntax.jl) end_base_include = time_ns() diff --git a/deps/JuliaSyntax.mk b/deps/JuliaSyntax.mk index ad46bd379e121..4a8afa8fbd53c 100644 --- a/deps/JuliaSyntax.mk +++ b/deps/JuliaSyntax.mk @@ -4,7 +4,7 @@ $(BUILDDIR)/$(JULIASYNTAX_SRC_DIR)/build-compiled: $(BUILDDIR)/$(JULIASYNTAX_SRC @# no build steps echo 1 > $@ -$(eval $(call symlink_install,JuliaSyntax,$$(JULIASYNTAX_SRC_DIR),$$(JULIAHOME)/base)) +$(eval $(call symlink_install,JuliaSyntax,$$(JULIASYNTAX_SRC_DIR),$$(BUILDROOT)/base)) clean-JuliaSyntax: -rm -f $(BUILDDIR)/$(JULIASYNTAX_SRC_DIR)/build-compiled