Make trimming tests work in an out-of-tree build.

Author: maleadt

test/trimming/Makefile

@@ -16,9 +16,11 @@ endif
 # location of test source
 SRCDIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
 JULIAHOME := $(abspath $(SRCDIR)/../..)
-BUILDSCRIPT := $(BIN)/../share/julia/juliac-buildscript.jl
+BUILDDIR := $(BUILDROOT)/test/trimming
 include $(JULIAHOME)/Make.inc
 
+BUILDSCRIPT := $(BUILDROOT)/usr/share/julia/juliac-buildscript.jl
+
 # get the executable suffix, if any
 EXE := $(suffix $(abspath $(JULIA)))
 
@@ -30,26 +32,29 @@ LDFLAGS_ADD = -lm $(shell $(JULIA_CONFIG) --ldflags --ldlibs) -ljulia-internal
 
 #=============================================================================
 
-release: hello$(EXE) basic_jll$(EXE)
+release: $(BUILDDIR)/hello$(EXE) $(BUILDDIR)/basic_jll$(EXE)
+
+$(BUILDDIR):
+	mkdir -p $(BUILDDIR)
 
-hello-o.a: $(SRCDIR)/hello.jl $(BUILDSCRIPT)
-	$(JULIA) -t 1 -J $(BIN)/../lib/julia/sys.$(SHLIB_EXT) --startup-file=no --history-file=no --output-o $@ --output-incremental=no --strip-ir --strip-metadata --experimental --trim $(BUILDSCRIPT) $< --output-exe true
+$(BUILDDIR)/hello-o.a: $(SRCDIR)/hello.jl $(BUILDSCRIPT) | $(BUILDDIR)
+	$(JULIA) -t 1 -J $(BUILDROOT)/usr/lib/julia/sys.$(SHLIB_EXT) --startup-file=no --history-file=no --output-o $@ --output-incremental=no --strip-ir --strip-metadata --experimental --trim $(BUILDSCRIPT) $< --output-exe true
 
-basic_jll-o.a: $(SRCDIR)/basic_jll.jl $(BUILDSCRIPT)
-	$(JULIA) -t 1 -J $(BIN)/../lib/julia/sys.$(SHLIB_EXT) --startup-file=no --history-file=no --project=$(SRCDIR) -e "using Pkg; Pkg.instantiate()"
-	$(JULIA) -t 1 -J $(BIN)/../lib/julia/sys.$(SHLIB_EXT) --startup-file=no --history-file=no --project=$(SRCDIR) --output-o $@ --output-incremental=no --strip-ir --strip-metadata --experimental --trim $(BUILDSCRIPT) $< --output-exe true
+$(BUILDDIR)/basic_jll-o.a: $(SRCDIR)/basic_jll.jl $(BUILDSCRIPT) | $(BUILDDIR)
+	$(JULIA) -t 1 -J $(BUILDROOT)/usr/lib/julia/sys.$(SHLIB_EXT) --startup-file=no --history-file=no --project=$(SRCDIR) -e "using Pkg; Pkg.instantiate()"
+	$(JULIA) -t 1 -J $(BUILDROOT)/usr/lib/julia/sys.$(SHLIB_EXT) --startup-file=no --history-file=no --project=$(SRCDIR) --output-o $@ --output-incremental=no --strip-ir --strip-metadata --experimental --trim $(BUILDSCRIPT) $< --output-exe true
 
-hello$(EXE): hello-o.a
+$(BUILDDIR)/hello$(EXE): $(BUILDDIR)/hello-o.a | $(BUILDDIR)
 	$(CC) -o $@ $(WHOLE_ARCHIVE) $< $(NO_WHOLE_ARCHIVE) $(CPPFLAGS_ADD) $(CPPFLAGS) $(CFLAGS_ADD) $(CFLAGS) $(LDFLAGS_ADD) $(LDFLAGS)
 
-basic_jll$(EXE): basic_jll-o.a
+$(BUILDDIR)/basic_jll$(EXE): $(BUILDDIR)/basic_jll-o.a | $(BUILDDIR)
 	$(CC) -o $@ $(WHOLE_ARCHIVE) $< $(NO_WHOLE_ARCHIVE) $(CPPFLAGS_ADD) $(CPPFLAGS) $(CFLAGS_ADD) $(CFLAGS) $(LDFLAGS_ADD) $(LDFLAGS)
 
-check: hello$(EXE) basic_jll$(EXE)
+check: $(BUILDDIR)/hello$(EXE) $(BUILDDIR)/basic_jll$(EXE) | $(BUILDDIR)
 	$(JULIA) --depwarn=error $(SRCDIR)/../runtests.jl $(SRCDIR)/trimming
 
 clean:
-	-rm -f hello$(EXE) basic_jll$(EXE) hello-o.a basic_jll-o.a
+	-rm -f $(BUILDDIR)/hello$(EXE) $(BUILDDIR)/basic_jll$(EXE) $(BUILDDIR)/hello-o.a $(BUILDDIR)/basic_jll-o.a
 
 .PHONY: release clean check