copy libzstd over for trimming tests

Author: IanButterworth

test/trimming/Makefile

@@ -33,7 +33,12 @@ JULIAC_BUILDSCRIPT := $(shell $(JULIA) -e 'print(joinpath(Sys.BINDIR, Base.DATAR
 
 #=============================================================================
 
-release: $(BIN)/hello$(EXE) $(BIN)/basic_jll$(EXE)
+release: prepare_zstd $(BIN)/hello$(EXE) $(BIN)/basic_jll$(EXE)
+
+# Copy over Zstd_jll.libzstd because the LazyLibrary can't be used directly
+prepare_zstd:
+	@mkdir -p $(BIN)/lib
+	$(JULIA) --startup-file=no --history-file=no --project=$(SRCDIR) -e "using Zstd_jll; mkpath(joinpath(\"$(SRCDIR)\", \"lib\")); cp(Zstd_jll.libzstd_path, joinpath(\"$(SRCDIR)\", \"lib\", basename(Zstd_jll.libzstd_path)), force=true)"
 
 $(BIN)/hello-o.a: $(SRCDIR)/hello.jl $(JULIAC_BUILDSCRIPT)
 	$(JULIA) -t 1 -J $(JULIA_LIBDIR)/julia/sys.$(SHLIB_EXT) --startup-file=no --history-file=no --output-o $@ --output-incremental=no --strip-ir --strip-metadata --experimental --trim $(JULIAC_BUILDSCRIPT) $< --output-exe true
@@ -48,11 +53,12 @@ $(BIN)/hello$(EXE): $(BIN)/hello-o.a
 $(BIN)/basic_jll$(EXE): $(BIN)/basic_jll-o.a
 	$(CC) -o $@ $(WHOLE_ARCHIVE) $< $(NO_WHOLE_ARCHIVE) $(CPPFLAGS_ADD) $(CPPFLAGS) $(CFLAGS_ADD) $(CFLAGS) $(LDFLAGS_ADD) $(LDFLAGS)
 
-check: $(BIN)/hello$(EXE) $(BIN)/basic_jll$(EXE)
+check: prepare_zstd $(BIN)/hello$(EXE) $(BIN)/basic_jll$(EXE)
 	$(JULIA) --depwarn=error $(SRCDIR)/trimming.jl $<
 
 clean:
 	-rm -f $(BIN)/hello$(EXE) $(BIN)/basic_jll$(EXE) $(BIN)/hello-o.a $(BIN)/basic_jll-o.a
+	-rm -rf $(BIN)/lib
 
 .PHONY: release clean check
 

test/trimming/basic_jll.jl

@@ -1,9 +1,11 @@
 using Libdl
-using Zstd_jll
+
+# TODO: Can't currently use Zstd_jll because stdlib jlls are all LazyLibraries
+const libzstd = findfirst(startswith("libzstd"), readdir(joinpath(@__DIR__, "lib"), join=true))
 
 function @main(args::Vector{String})::Cint
     println(Core.stdout, "Julia! Hello, world!")
-    fptr = dlsym(Zstd_jll.libzstd, :ZSTD_versionString)
+    fptr = dlsym(libzstd, :ZSTD_versionString)
     println(Core.stdout, unsafe_string(ccall(fptr, Cstring, ())))
     println(Core.stdout, unsafe_string(ccall((:ZSTD_versionString, libzstd), Cstring, ())))
     return 0