Skip to content

Commit e571c3b

Browse files
authored
[mono][wasm] Remove unused targets from wasm/Makefile. (#63263)
The real build now happens in runtime/CMakeLists.txt, the Makefile contains only helper targets now.
1 parent b42188a commit e571c3b

File tree

1 file changed

+7
-75
lines changed

1 file changed

+7
-75
lines changed

src/mono/wasm/Makefile

Lines changed: 7 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,15 @@ JSVU=$(HOME)/.jsvu
1212
CHROMEDRIVER?=$(HOME)/.chromedriver
1313
GECKODRIVER?=$(HOME)/.geckodriver
1414

15-
#
16-
# These variables are set by wasm.proj
17-
#
1815
EMSDK_PATH?=$(TOP)/src/mono/wasm/emsdk
1916
CONFIG?=Release
2017
BINDIR?=$(TOP)/artifacts/bin
2118
OBJDIR?=$(TOP)/artifacts/obj
22-
PINVOKE_TABLE?=$(TOP)/artifacts/obj/wasm/pinvoke-table.h
23-
MONO_BIN_DIR?=$(BINDIR)/mono/Browser.wasm.$(CONFIG)
24-
NATIVE_BIN_DIR?=$(BINDIR)/native/net7.0-Browser-$(CONFIG)-wasm
25-
ICU_LIBDIR?=
26-
SYSTEM_NATIVE_LIBDIR?=$(TOP)/src/native/libs/System.Native
2719
_MSBUILD_WASM_BUILD_ARGS=/p:TargetOS=Browser /p:TargetArchitecture=wasm /p:Configuration=$(CONFIG)
2820
XHARNESS_BROWSER?=chrome
29-
EMCC_DEFAULT_RSP=$(NATIVE_BIN_DIR)/src/emcc-default.rsp
3021
HELIX_TARGET_QUEUE?=Ubuntu.1804.Amd64.Open
3122

32-
all: build-native icu-files source-files header-files
23+
all: build-all
3324

3425
#
3526
# EMSCRIPTEN SETUP
@@ -53,78 +44,16 @@ provision-wasm: .stamp-wasm-install-and-select-$(EMSCRIPTEN_VERSION)
5344
@echo "----------------------------------------------------------"
5445
@echo "Installed emsdk into EMSDK_PATH=$(TOP)/src/mono/wasm/emsdk"
5546

56-
# FIXME: When https://github.com/dotnet/runtime/issues/54565 is fixed, and the WasmApp targets are updated to use mono runtime components, remove this
57-
MONO_COMPONENT_LIBS= \
58-
$(MONO_BIN_DIR)/libmono-component-hot_reload-static.a \
59-
$(MONO_BIN_DIR)/libmono-component-debugger-static.a \
60-
$(MONO_BIN_DIR)/libmono-component-diagnostics_tracing-stub-static.a
61-
6247
MONO_OBJ_DIR=$(OBJDIR)/mono/Browser.wasm.$(CONFIG)
63-
MONO_INCLUDE_DIR=$(MONO_BIN_DIR)/include/mono-2.0
6448
BUILDS_OBJ_DIR=$(MONO_OBJ_DIR)/wasm
65-
# libmonosgen-2.0 is in MONO_LIBS twice because the components and the runtime are depend on each other
66-
MONO_LIBS = \
67-
$(MONO_BIN_DIR)/libmono-ee-interp.a \
68-
$(MONO_BIN_DIR)/libmonosgen-2.0.a \
69-
$(MONO_COMPONENT_LIBS) \
70-
$(MONO_BIN_DIR)/libmonosgen-2.0.a \
71-
$(MONO_BIN_DIR)/libmono-ilgen.a \
72-
$(MONO_BIN_DIR)/libmono-icall-table.a \
73-
$(MONO_BIN_DIR)/libmono-profiler-aot.a \
74-
${NATIVE_BIN_DIR}/libSystem.Native.a \
75-
${NATIVE_BIN_DIR}/libSystem.IO.Compression.Native.a \
76-
$(ICU_LIBDIR)/libicuuc.a \
77-
$(ICU_LIBDIR)/libicui18n.a
78-
79-
ifeq ($(NOSTRIP),)
80-
STRIP_CMD=&& $(EMSDK_PATH)/upstream/bin/wasm-opt --strip-dwarf $(NATIVE_BIN_DIR)/dotnet.wasm -o $(NATIVE_BIN_DIR)/dotnet.wasm
81-
else
82-
STRIP_CMD=
83-
endif
84-
85-
#
86-
# Wasm builds
87-
#
88-
89-
$(NATIVE_BIN_DIR):
90-
mkdir -p $$@
91-
92-
$(NATIVE_BIN_DIR)/src:
93-
mkdir -p $$@
94-
95-
$(NATIVE_BIN_DIR)/include/wasm:
96-
mkdir -p $$@
97-
98-
$(BUILDS_OBJ_DIR):
99-
mkdir -p $$@
100-
101-
$(NATIVE_BIN_DIR)/dotnet.js: runtime/driver.c runtime/pinvoke.c runtime/pinvoke.h runtime/corebindings.c $(NATIVE_BIN_DIR)/src/cjs/runtime.cjs.iffe.js runtime/cjs/dotnet.cjs.lib.js $(SYSTEM_NATIVE_LIBDIR)/pal_random.lib.js $(MONO_LIBS) $(EMCC_DEFAULT_RSP) | $(NATIVE_BIN_DIR)
102-
$(DOTNET) build $(CURDIR)/wasm.proj $(_MSBUILD_WASM_BUILD_ARGS) /t:BuildWasmRuntimes $(MSBUILD_ARGS)
103-
104-
$(EMCC_DEFAULT_RSP): $(CURDIR)/wasm.proj | $(NATIVE_BIN_DIR)/src Makefile
105-
$(DOTNET) build $(CURDIR)/wasm.proj /p:Configuration=$(CONFIG) /t:GenerateEmccPropsAndRspFiles
106-
107-
$(NATIVE_BIN_DIR)/src/emcc-props.json: $(EMSDK_PATH)/upstream/.emsdk_version | $(NATIVE_BIN_DIR)/src
108-
$(DOTNET) build $(CURDIR)/wasm.proj /p:Configuration=$(CONFIG) /t:GenerateEmccPropsAndRspFiles
109-
110-
build-native: $(NATIVE_BIN_DIR)/dotnet.js $(NATIVE_BIN_DIR)/src/emcc-default.rsp $(NATIVE_BIN_DIR)/src/emcc-props.json
11149

11250
clean-emsdk:
11351
$(RM) -rf $(EMSDK_LOCAL_PATH)
11452

115-
clean:
116-
$(RM) -rf $(BUILDS_OBJ_DIR)
117-
118-
icu-files: $(wildcard $(ICU_LIBDIR)/*.dat) $(ICU_LIBDIR)/libicuuc.a $(ICU_LIBDIR)/libicui18n.a | $(NATIVE_BIN_DIR)
119-
cp $^ $(NATIVE_BIN_DIR)
120-
121-
source-files: runtime/driver.c runtime/pinvoke.c runtime/corebindings.c runtime/cjs/dotnet.cjs.lib.js $(SYSTEM_NATIVE_LIBDIR)/pal_random.lib.js | $(NATIVE_BIN_DIR)/src
122-
cp $^ $(NATIVE_BIN_DIR)/src
123-
124-
header-files: runtime/pinvoke.h | $(NATIVE_BIN_DIR)/include/wasm
125-
cp $^ $(NATIVE_BIN_DIR)/include/wasm
126-
53+
#
12754
# Helper targets
55+
#
56+
12857
.PHONY: runtime
12958
.PHONY: build
13059

@@ -153,6 +82,9 @@ app-builder:
15382
build-tasks:
15483
$(DOTNET) build $(TOP)/src/tasks/WasmBuildTasks $(MSBUILD_ARGS)
15584

85+
clean:
86+
$(RM) -rf $(BUILDS_OBJ_DIR)
87+
15688
run-tests-v8-%:
15789
EMSDK_PATH=$(EMSDK_PATH) PATH="$(JSVU):$(PATH)" $(DOTNET) build $(TOP)/src/libraries/$*/tests/ /t:Test $(_MSBUILD_WASM_BUILD_ARGS) /p:JSEngine=V8 $(MSBUILD_ARGS)
15890
run-tests-sm-%:

0 commit comments

Comments
 (0)