From 72b7d236ad634c2280c73499ebfc2b594995ec06 Mon Sep 17 00:00:00 2001 From: Zoltan Varga Date: Tue, 10 Nov 2020 20:08:07 -0500 Subject: [PATCH] Add libs.native subset when using the runtime helper target in the wasm makefile (#44450) Ensures libSystem.Native.a/libSystem.IO.Compression.Native.a end up in the runtime pack. --- src/mono/wasm/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mono/wasm/Makefile b/src/mono/wasm/Makefile index 5e74d25..b359f4c 100644 --- a/src/mono/wasm/Makefile +++ b/src/mono/wasm/Makefile @@ -122,9 +122,6 @@ clean-emsdk: clean: $(RM) -rf $(BUILDS_OBJ_DIR) -# Helper targets -.PHONY: runtime - icu-files: $(wildcard $(ICU_LIBDIR)/*.dat) $(ICU_LIBDIR)/libicuuc.a $(ICU_LIBDIR)/libicui18n.a | $(NATIVE_BIN_DIR) cp $^ $(NATIVE_BIN_DIR) @@ -134,6 +131,9 @@ source-files: runtime/driver.c runtime/pinvoke.c runtime/corebindings.c runtime/ header-files: runtime/pinvoke.h $(BUILDS_OBJ_DIR)/pinvoke-table.h | $(NATIVE_BIN_DIR)/include/wasm cp $^ $(NATIVE_BIN_DIR)/include/wasm +# Helper targets +.PHONY: runtime + build: EMSDK_PATH=$(EMSDK_PATH) $(TOP)/build.sh mono+libs.pretest -os Browser -c $(CONFIG) /p:ContinueOnError=false /p:StopOnFirstFailure=true @@ -141,7 +141,7 @@ build-all: EMSDK_PATH=$(EMSDK_PATH) $(TOP)/build.sh mono+libs -os Browser -c $(CONFIG) /p:ContinueOnError=false /p:StopOnFirstFailure=true runtime: - EMSDK_PATH=$(EMSDK_PATH) $(TOP)/build.sh mono.runtime+mono.wasmruntime+libs.pretest -os Browser -c $(CONFIG) /p:ContinueOnError=false /p:StopOnFirstFailure=true + EMSDK_PATH=$(EMSDK_PATH) $(TOP)/build.sh mono.runtime+mono.wasmruntime+libs.native+libs.pretest -os Browser -c $(CONFIG) /p:ContinueOnError=false /p:StopOnFirstFailure=true corlib: EMSDK_PATH=$(EMSDK_PATH) $(TOP)/build.sh mono.corelib+mono.wasmruntime+libs.pretest -os Browser -c $(CONFIG) /p:ContinueOnError=false /p:StopOnFirstFailure=true -- 2.7.4