Add libs.native subset when using the runtime helper target in the wasm makefile...
authorZoltan Varga <vargaz@gmail.com>
Wed, 11 Nov 2020 01:08:07 +0000 (20:08 -0500)
committerGitHub <noreply@github.com>
Wed, 11 Nov 2020 01:08:07 +0000 (02:08 +0100)
Ensures libSystem.Native.a/libSystem.IO.Compression.Native.a end up in the runtime pack.

src/mono/wasm/Makefile

index 5e74d25..b359f4c 100644 (file)
@@ -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