Adapt build system for in-tree JuliaSyntax

These are the simplest possible adaptions to create the vendored
Base.JuliaSyntax from an in-tree version of JuliaSyntax (JuliaLowering
to be hooked up later).

Author: c42f

Makefile

@@ -79,7 +79,7 @@ ifndef JULIA_VAGRANT_BUILD
 endif
 endif
 
-TOP_LEVEL_PKGS := Compiler
+TOP_LEVEL_PKGS := Compiler JuliaSyntax JuliaLowering
 
 TOP_LEVEL_PKG_LINK_TARGETS := $(addprefix $(build_datarootdir)/julia/,$(TOP_LEVEL_PKGS))
 

base/Base.jl

@@ -315,9 +315,9 @@ a_method_to_overwrite_in_test() = inferencebarrier(1)
 @eval Core const Compiler = $Base.Compiler
 @eval Compiler const fl_parse = $Base.fl_parse
 
-# External libraries vendored into Base
+# Compiler frontend
 Core.println("JuliaSyntax/src/JuliaSyntax.jl")
-include(@__MODULE__, string(BUILDROOT, "JuliaSyntax/src/JuliaSyntax.jl")) # include($BUILDROOT/base/JuliaSyntax/JuliaSyntax.jl)
+include(@__MODULE__, string(DATAROOT, "julia/JuliaSyntax/src/JuliaSyntax.jl"))
 
 end_base_include = time_ns()
 

base/sysimg.jl

@@ -153,7 +153,12 @@ end
 
 empty!(Base.TOML_CACHE.d)
 Base.TOML.reinit!(Base.TOML_CACHE.p, "")
-@eval Base BUILDROOT = ""
+
+# Clear some build-related globals (TODO: Use Base.delete_binding?)
+@eval Base begin
+    DATAROOT = ""
+    BUILDROOT = ""
+end
 @eval Sys begin
     BINDIR = ""
     STDLIB = ""

deps/JuliaSyntax.mk

@@ -36,8 +36,6 @@ BUILDDIR := $(BUILDDIR)$(MAYBE_HOST)
 # prevent installing libs into usr/lib64 on opensuse
 unexport CONFIG_SITE
 
-DEP_LIBS := JuliaSyntax
-
 ifeq ($(USE_SYSTEM_LIBBLASTRAMPOLINE), 0)
 DEP_LIBS += blastrampoline
 endif
@@ -212,7 +210,7 @@ DEP_LIBS_STAGED := $(DEP_LIBS)
 DEP_LIBS_STAGED_ALL := llvm llvm-tools clang llvmunwind unwind libuv pcre \
 	openlibm dsfmt blastrampoline openblas lapack gmp mpfr patchelf utf8proc \
 	objconv openssl libssh2 nghttp2 curl libgit2 libwhich zlib zstd p7zip csl \
-	sanitizers libsuitesparse lld libtracyclient ittapi nvtx JuliaSyntax \
+	sanitizers libsuitesparse lld libtracyclient ittapi nvtx \
 	terminfo mmtk_julia
 DEP_LIBS_ALL := $(DEP_LIBS_STAGED_ALL)
 
@@ -297,7 +295,4 @@ include $(SRCDIR)/terminfo.mk
 # MMTk
 include $(SRCDIR)/mmtk_julia.mk
 
-# vendored Julia libs
-include $(SRCDIR)/JuliaSyntax.mk
-
 include $(SRCDIR)/tools/uninstallers.mk

deps/JuliaSyntax.version

@@ -76,9 +76,12 @@ COMPILER_SRCS := $(addprefix $(JULIAHOME)/, \
 		base/traits.jl \
 		base/tuple.jl)
 COMPILER_SRCS += $(shell find $(JULIAHOME)/Compiler/src -name \*.jl -and -not -name verifytrim.jl -and -not -name show.jl)
+# Julia-based compiler frontend is bootstrapped into Base for now
+COMPILER_FRONTEND_SRCS = $(shell find $(JULIAHOME)/JuliaSyntax/src -name \*.jl)
 # sort these to remove duplicates
 BASE_SRCS := $(sort $(shell find $(JULIAHOME)/base -name \*.jl -and -not -name sysimg.jl) \
                     $(shell find $(BUILDROOT)/base -name \*.jl  -and -not -name sysimg.jl)) \
+			 $(COMPILER_FRONTEND_SRCS) \
              $(JULIAHOME)/Compiler/src/ssair/show.jl \
              $(JULIAHOME)/Compiler/src/verifytrim.jl
 STDLIB_SRCS := $(JULIAHOME)/base/sysimg.jl $(SYSIMG_STDLIBS_SRCS)