Use new compiler-rt logic for testing

Author: alexcrichton

.github/workflows/main.yml

@@ -157,21 +157,7 @@ jobs:
 
     - name: Test
       if: matrix.test
-      # For Clang linking to work correctly, we need to place Clang's runtime
-      # library for `wasm32-wasi` in the right location (i.e., the `mkdir` and
-      # `cp` below).
-      run: |
-        cd test
-        mkdir resource-dir
-        export WASI_DIR=./resource-dir/lib/wasi/
-        export WASIP1_DIR=./resource-dir/lib/wasip1/
-        export WASIP2_DIR=./resource-dir/lib/wasip2/
-        mkdir -p $WASI_DIR $WASIP1_DIR $WASIP2_DIR
-        cp build/download/libclang_rt.builtins-wasm32.a $WASI_DIR
-        cp build/download/libclang_rt.builtins-wasm32.a $WASIP1_DIR
-        cp build/download/libclang_rt.builtins-wasm32.a $WASIP2_DIR
-        export LDFLAGS="-resource-dir $(pwd)/resource-dir"
-        make test
+      run: make -C test test
 
     - uses: actions/[email protected]
       if: matrix.upload

Makefile

@@ -597,6 +597,8 @@ $(BUILTINS_LIB_PATH):
 	fi
 endif
 
+builtins: $(BUILTINS_LIB_PATH)
+
 # TODO: Specify SDK version, e.g. libc.so.wasi-sdk-21, as SO_NAME once `wasm-ld`
 # supports it.
 #

test/Makefile

@@ -35,8 +35,6 @@ $(SYSROOT):
 
 LIBC_TEST_URL ?= https://github.com/bytecodealliance/libc-test
 LIBC_TEST = $(DOWNDIR)/libc-test
-LIBRT_URL ?= https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-25/libclang_rt.builtins-wasm32-wasi-25.0.tar.gz
-LIBRT = $(DOWNDIR)/libclang_rt.builtins-wasm32.a
 ARCH := $(shell uname -m)
 WASMTIME_URL ?= https://github.com/bytecodealliance/wasmtime/releases/download/v29.0.1/wasmtime-v29.0.1-$(ARCH)-linux.tar.xz
 WASMTIME = $(abspath $(DOWNDIR)/$(shell basename $(WASMTIME_URL) .tar.xz)/wasmtime)
@@ -51,12 +49,6 @@ $(DOWNDIR):
 $(LIBC_TEST): | $(DOWNDIR)
 	git clone --depth 1 $(LIBC_TEST_URL) $@
 
-# TODO: add install target to copy builtins library directly into a Clang
-# installation.
-$(LIBRT): | $(DOWNDIR)
-	wget --no-clobber --directory-prefix=$(DOWNDIR) $(LIBRT_URL)
-	tar --extract --file=$(DOWNDIR)/$(shell basename $(LIBRT_URL)) --strip-components=1 --directory=$(DOWNDIR)/
-
 $(WASMTIME): | $(DOWNDIR)
 	wget --no-clobber --directory-prefix=$(DOWNDIR) $(WASMTIME_URL)
 	tar --extract --file=$(DOWNDIR)/$(shell basename $(WASMTIME_URL)) --directory=$(DOWNDIR)/
@@ -69,7 +61,7 @@ $(ADAPTER): | $(DOWNDIR)
 	wget --no-clobber --directory-prefix=$(DOWNDIR) $(ADAPTER_URL)
 
 # Target to download all necessary dependencies.
-TO_DOWNLOAD = $(LIBC_TEST) $(LIBRT) $(WASMTIME)
+TO_DOWNLOAD = $(LIBC_TEST) $(WASMTIME)
 ifeq ($(TARGET_TRIPLE), wasm32-wasip2)
 TO_DOWNLOAD += $(ADAPTER) $(WASM_TOOLS)
 endif
@@ -133,6 +125,16 @@ ifneq ($(findstring -threads,$(TARGET_TRIPLE)),)
 CFLAGS += -pthread
 endif
 
+# Handle compiler-rt which is required for tests. This is done by requesting
+# that the parent directory, the main wasi-libc directory, fetch its compiler-rt
+# which will create a `resource-dir` argument which we can then add to LDFLAGS
+# which gets fed down below into the actual linking of wasms.
+LDFLAGS += -resource-dir ../build/$(TARGET_TRIPLE)/resource-dir
+BUILTINS_STAMP := $(OBJDIR)/builtins.stamp
+$(BUILTINS_STAMP):
+	make -C .. builtins
+	touch $@
+
 # Build up all the `*.wasm.o` object files; these are the same regardless of
 # whether we're building core modules or components.
 $(WASM_OBJS): $(INFRA_HEADERS)
@@ -142,7 +144,7 @@ $(OBJDIR)/%.wasm.o: $(SRCDIR)/%.c $(DOWNLOADED) $(SYSROOT)
 
 # Build up all the `*.wasm` files.
 obj_to_c = $(patsubst $(OBJDIR)/%.wasm.o,$(SRCDIR)/%.c,$1)
-$(OBJDIR)/%.core.wasm: $(OBJDIR)/%.wasm.o $(INFRA_WASM_OBJS)
+$(OBJDIR)/%.core.wasm: $(OBJDIR)/%.wasm.o $(INFRA_WASM_OBJS) $(BUILTINS_STAMP)
 	@mkdir -p $(@D)
 	$(CC) $(CFLAGS) $(LDFLAGS) $(shell scripts/add-flags.py LDFLAGS $(call obj_to_c,$<)) $^ -o $@