Add beginnings of WebAssembly build support for mono.#33551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akoeplinger merged 10 commits into from
Apr 10, 2020
Merged

Add beginnings of WebAssembly build support for mono. #33551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7703390
Add beginnings of WebAssembly build support for mono.
vargaz Apr 3, 2020
b803077
Add beginnings of WebAssembly build support for mono.
vargaz Apr 3, 2020
5638e2b
Merge branch 'master' into wasm-build
akoeplinger Apr 7, 2020
03bd7da
Set emcc as the compiler for libraries build
akoeplinger Apr 7, 2020
9712249
Add default subsets for webassembly build
akoeplinger Apr 7, 2020
73d2a7c
Use WebAssembly Docker image
akoeplinger Apr 7, 2020
9e130dc
Fix various problems in the build
akoeplinger Apr 7, 2020
74819de
Merge remote-tracking branch 'upstream/master' into wasm-build
akoeplinger Apr 9, 2020
1da9cc8
Bump webassembly image
akoeplinger Apr 9, 2020
a4b955f
Use Mono runtime for webassembly builds
akoeplinger Apr 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion eng/Subsets.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@
<PropertyGroup>
<DefaultSubsets>clr+mono+libs+installer</DefaultSubsets>
<DefaultSubsets Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'Android' or '$(TargetOS)' == 'tvOS'">mono+libs+installer</DefaultSubsets>
<DefaultSubsetCategories Condition="'$(TargetOS)' == 'WebAssembly'">mono+libs</DefaultSubsetCategories>
</PropertyGroup>

<PropertyGroup>
Expand DownExpand Up@@ -66,7 +67,7 @@
</PropertyGroup>

<PropertyGroup>
<RuntimeFlavor Condition="'$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'Android'">Mono</RuntimeFlavor>
<RuntimeFlavor Condition="'$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'Android' or '$(TargetOS)' == 'WebAssembly'">Mono</RuntimeFlavor>
<RuntimeFlavor Condition="'$(RuntimeFlavor)' == '' and $(_subset.Contains('+mono.runtime+')) and !$(_subset.Contains('+clr.runtime+'))">Mono</RuntimeFlavor>
<RuntimeFlavor Condition="'$(RuntimeFlavor)' == ''">CoreCLR</RuntimeFlavor>
</PropertyGroup>
Expand Down
9 changes: 7 additions & 2 deletions eng/native/build-commons.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -151,8 +151,13 @@ build_native()

popd
else
echo "Executing cmake --build \"$intermediatesDir\" --target install -j $__NumProc"
cmake --build "$intermediatesDir" --target install -j "$__NumProc"
cmake_command=cmake
if [[ "$build_arch" == "wasm" ]]; then
cmake_command="emcmake $cmake_command"
fi

echo "Executing $cmake_command --build \"$intermediatesDir\" --target install -j $__NumProc"
$cmake_command --build "$intermediatesDir" --target install -j "$__NumProc"
fi

local exit_code="$?"
Expand Down
20 changes: 17 additions & 3 deletions eng/native/configureplatform.cmake
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -166,7 +166,8 @@ if(CLR_CMAKE_HOST_OS STREQUAL Windows)
endif(CLR_CMAKE_HOST_OS STREQUAL Windows)

if(CLR_CMAKE_HOST_OS STREQUAL Emscripten)
set(CLR_CMAKE_HOST_ARCH_WASM 1)
#set(CLR_CMAKE_HOST_UNIX 1) # TODO: this should be reenabled but it activates a bunch of additional compiler flags in configurecompiler.cmake
set(CLR_CMAKE_HOST_UNIX_WASM 1)
endif(CLR_CMAKE_HOST_OS STREQUAL Emscripten)

#--------------------------------------------
Expand DownExpand Up@@ -196,6 +197,9 @@ elseif(CLR_CMAKE_HOST_UNIX_AMD64)
elseif(CLR_CMAKE_HOST_UNIX_X86)
set(CLR_CMAKE_HOST_ARCH_I386 1)
set(CLR_CMAKE_HOST_ARCH "x86")
elseif(CLR_CMAKE_HOST_UNIX_WASM)
set(CLR_CMAKE_HOST_ARCH_WASM 1)
set(CLR_CMAKE_HOST_ARCH "wasm")
elseif(WIN32)
# CLR_CMAKE_HOST_ARCH is passed in as param to cmake
if (CLR_CMAKE_HOST_ARCH STREQUAL x64)
Expand DownExpand Up@@ -237,6 +241,8 @@ if (CLR_CMAKE_TARGET_ARCH STREQUAL x64)
set(CLR_CMAKE_TARGET_ARCH_ARM 1)
set(CLR_CMAKE_TARGET_ARCH_ARMV7L 1)
set(ARM_SOFTFP 1)
elseif(CLR_CMAKE_TARGET_ARCH STREQUAL wasm)
set(CLR_CMAKE_TARGET_ARCH_WASM 1)
else()
clr_unknown_arch()
endif()
Expand DownExpand Up@@ -306,6 +312,12 @@ if(CLR_CMAKE_TARGET_OS STREQUAL SunOS)
set(CLR_CMAKE_TARGET_SUNOS 1)
endif(CLR_CMAKE_TARGET_OS STREQUAL SunOS)

if(CLR_CMAKE_TARGET_OS STREQUAL Emscripten)
set(CLR_CMAKE_TARGET_UNIX 1)
set(CLR_CMAKE_TARGET_LINUX 1)
set(CLR_CMAKE_TARGET_EMSCRIPTEN 1)
endif(CLR_CMAKE_TARGET_OS STREQUAL Emscripten)

if(CLR_CMAKE_TARGET_UNIX)
if(CLR_CMAKE_TARGET_ARCH STREQUAL x64)
set(CLR_CMAKE_TARGET_UNIX_AMD64 1)
Expand All@@ -317,6 +329,8 @@ if(CLR_CMAKE_TARGET_UNIX)
set(CLR_CMAKE_TARGET_UNIX_ARM64 1)
elseif(CLR_CMAKE_TARGET_ARCH STREQUAL x86)
set(CLR_CMAKE_TARGET_UNIX_X86 1)
elseif(CLR_CMAKE_TARGET_ARCH STREQUAL wasm)
set(CLR_CMAKE_TARGET_UNIX_WASM 1)
else()
clr_unknown_arch()
endif()
Expand All@@ -343,7 +357,7 @@ else()
endif()
endif()

if(NOT CLR_CMAKE_HOST_ARCH_WASM)
if(NOT CLR_CMAKE_TARGET_EMSCRIPTEN)
# Skip check_pie_supported call on Android as ld from llvm toolchain with NDK API level 21
# complains about missing linker flag `-no-pie` (while level 28's ld does support this flag,
# but since we know that PIE is supported, we can safely skip this redundant check).
Expand All@@ -363,7 +377,7 @@ if(NOT CLR_CMAKE_HOST_ARCH_WASM)
endif(NOT CLR_CMAKE_TARGET_ANDROID)

set(CMAKE_POSITION_INDEPENDENT_CODE ON)
endif(NOT CLR_CMAKE_HOST_ARCH_WASM)
endif(NOT CLR_CMAKE_TARGET_EMSCRIPTEN)

string(TOLOWER "${CMAKE_BUILD_TYPE}" LOWERCASE_CMAKE_BUILD_TYPE)
if(LOWERCASE_CMAKE_BUILD_TYPE STREQUAL debug)
Expand Down
2 changes: 1 addition & 1 deletion eng/native/configuretools.cmake
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ if (CMAKE_C_COMPILER MATCHES "-?[0-9]+(\.[0-9]+)?$")
set(CLR_CMAKE_COMPILER_FILE_NAME_VERSION "${CMAKE_MATCH_0}")
endif()

if(NOT WIN32)
if(NOT WIN32 AND NOT CLR_CMAKE_TARGET_ARCH_WASM)
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
if(APPLE)
set(TOOLSET_PREFIX "")
Expand Down
4 changes: 4 additions & 0 deletions eng/native/gen-buildsys.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -87,6 +87,10 @@ if [[ "$scan_build" == "ON" && -n "$SCAN_BUILD_COMMAND" ]]; then
cmake_command="$SCAN_BUILD_COMMAND $cmake_command"
fi

if [[ "$build_arch" == "wasm" ]]; then
cmake_command="emcmake $cmake_command"
fi

# Include CMAKE_USER_MAKE_RULES_OVERRIDE as uninitialized since it will hold its value in the CMake cache otherwise can cause issues when branch switching
$cmake_command \
-G "$generator" \
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/common/platform-matrix.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -169,7 +169,7 @@ jobs:
archType: wasm
platform: WebAssembly_wasm
container:
image: ubuntu-16.04-20200401182342-fe8b85d
image: ubuntu-18.04-webassembly-20200409132031-f70ea41
registry: mcr
jobParameters:
runtimeFlavor: ${{ parameters.runtimeFlavor }}
Expand Down
5 changes: 1 addition & 4 deletions eng/pipelines/libraries/base-job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,7 @@ jobs:
- ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubGroup, ''), eq(parameters.archType, 'arm')) }}:
- _runtimeOSArg: /p:RuntimeOS=ubuntu.16.04

# force a value for OS when cross-building WebAssembly
- ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
- _runtimeOSArg: -os ${{ parameters.osGroup }}

Expand DownExpand Up@@ -107,10 +108,6 @@ jobs:
- _runtimeArtifactsPathArg: ' /p:RuntimeArtifactsPath=$(_runtimeDownloadPath)'
- _testRunNamePrefixSuffix: $(runtimeFlavorName)_${{ parameters.liveRuntimeBuildConfig }}

# WebAssembly uses linux implementation detail
- ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
- _runtimeArtifactName: 'CoreLib_Linux_x64_${{ parameters.liveRuntimeBuildConfig }}'

# Windows variables
- ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
- _runtimeOSArg: /p:RuntimeOS=win10
Expand Down
24 changes: 6 additions & 18 deletions eng/pipelines/libraries/build-job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,21 +49,18 @@ jobs:

${{ if ne(parameters.liveRuntimeBuildConfig, '') }}:
dependsOn:
- ${{ if ne(parameters.osGroup, 'WebAssembly') }}:
# Use corelib dependencies for coreclr and non test builds
- ${{ if and(eq(parameters.runtimeFlavor, 'coreclr'), eq(parameters.testScope, '')) }}:
- ${{ format('coreclr_corelib_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}
- ${{ if or(ne(parameters.runtimeFlavor, 'coreclr'), ne(parameters.testScope, '')) }}:
- ${{ format('{0}_product_build_{1}{2}_{3}_{4}', parameters.runtimeFlavor, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}
- ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
- ${{ format('coreclr_corelib_build_{1}{2}_{3}_{4}', parameters.runtimeFlavor, 'linux', parameters.osSubgroup, 'x64', parameters.liveRuntimeBuildConfig) }}
# Use corelib dependencies for coreclr and non test builds
- ${{ if and(eq(parameters.runtimeFlavor, 'coreclr'), eq(parameters.testScope, '')) }}:
- ${{ format('coreclr_corelib_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}
- ${{ if or(ne(parameters.runtimeFlavor, 'coreclr'), ne(parameters.testScope, '')) }}:
- ${{ format('{0}_product_build_{1}{2}_{3}_{4}', parameters.runtimeFlavor, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}

variables:
- _subset: libs
- _addtionalBuildArguments: ''
- ${{ parameters.variables }}
- ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
- EMSDK_PATH: $(Build.BinariesDirectory)/emsdk
- EMSDK_PATH: /usr/local/emscripten
Comment thread
vargaz marked this conversation as resolved.
- ${{ if eq(parameters.runTests, true) }}:
- _subset: libs+libs.tests
- _addtionalBuildArguments: /p:ArchiveTests=true
Expand All@@ -80,15 +77,6 @@ jobs:
ln -s /usr/local/opt/openssl/lib/pkgconfig/openssl.pc /usr/local/lib/pkgconfig/
displayName: Install Build Dependencies

- ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
- script: |
EMSCRIPTEN_VERSION=1.38.47
git clone https://github.com/emscripten-core/emsdk.git $(EMSDK_PATH)
cd $(EMSDK_PATH)
./emsdk install ${EMSCRIPTEN_VERSION}-upstream
./emsdk activate --embedded ${EMSCRIPTEN_VERSION}-upstream
displayName: Install Emscripten

- ${{ if eq(parameters.isOfficialBuild, true) }}:
- template: /eng/pipelines/common/restore-internal-tools.yml
parameters:
Expand Down
7 changes: 7 additions & 0 deletions eng/pipelines/mono/templates/build-job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,13 @@ jobs:
- ${{ if eq(parameters.osGroup, 'Android') }}:
- name: osOverride
value: -os Android
- ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
- name: EMSDK_PATH
value: /usr/local/emscripten
- name: archType
value: wasm
- name: osOverride
value: '-os WebAssembly'
- ${{ parameters.variables }}

steps:
Expand Down
5 changes: 4 additions & 1 deletion eng/pipelines/runtime.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -266,6 +266,7 @@ jobs:
- Linux_arm
- Linux_arm64
- Linux_musl_x64
- WebAssembly_wasm
# - Linux_musl_arm64
- Windows_NT_x64
# - Windows_NT_x86
Expand DownExpand Up@@ -302,6 +303,7 @@ jobs:
- Linux_arm
- Linux_arm64
- Linux_musl_x64
- WebAssembly_wasm
# - Linux_musl_arm64
- Windows_NT_x64
# - Windows_NT_x86
Expand DownExpand Up@@ -420,6 +422,7 @@ jobs:
# - iOS_arm # https://github.com/dotnet/runtime/issues/34465
- iOS_arm64
- iOS_x64
- WebAssembly_wasm
jobParameters:
liveRuntimeBuildConfig: release

Expand All@@ -438,6 +441,7 @@ jobs:
# - iOS_arm # https://github.com/dotnet/runtime/issues/34465
- iOS_arm64
- iOS_x64
- WebAssembly_wasm
jobParameters:
liveRuntimeBuildConfig: debug

Expand All@@ -449,7 +453,6 @@ jobs:
jobTemplate: /eng/pipelines/libraries/build-job.yml
buildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
platforms:
- WebAssembly_wasm
- ${{ if eq(variables['isFullMatrix'], false) }}:
- Windows_NT_x86
jobParameters:
Expand Down
3 changes: 3 additions & 0 deletions src/libraries/Native/Unix/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,9 @@ elseif (CLR_CMAKE_TARGET_ARCH_I386)
add_definitions(-DTARGET_32BIT=1)
add_definitions(-DTARGET_X86)
add_definitions(-D_FILE_OFFSET_BITS=64)
elseif (CLR_CMAKE_TARGET_ARCH_WASM)
add_definitions(-DTARGET_32BIT=1)
add_definitions(-DTARGET_WASM)
elseif (CLR_CMAKE_TARGET_ARCH_ARM64)
add_definitions(-DTARGET_64BIT=1)
add_definitions(-DTARGET_ARM64)
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/Native/Unix/System.IO.Compression.Native/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
project(System.IO.Compression.Native C)

if (CLR_CMAKE_TARGET_WASM)
if (CLR_CMAKE_TARGET_ARCH_WASM)
add_definitions(-s USE_ZLIB)
elseif (CLR_CMAKE_TARGET_ANDROID)
# need special case here since we want to link against libz.so but find_package() would resolve libz.a
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/Native/Unix/System.Native/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ else ()
set(NATIVE_SOURCES ${NATIVE_SOURCES} pal_console.c)
endif ()

if (CLR_CMAKE_TARGET_LINUX)
if (CLR_CMAKE_TARGET_LINUX AND NOT CLR_CMAKE_TARGET_ARCH_WASM)
set(NATIVE_SOURCES ${NATIVE_SOURCES} pal_networkchange.c)

if (!HAVE_LINUX_RTNETLINK_H)
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/Native/Unix/System.Native/pal_runtimeinformation.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ int32_t SystemNative_GetOSArchitecture()
return ARCH_ARM64;
#elif defined(TARGET_AMD64)
return ARCH_X64;
#elif defined(TARGET_X86)
#elif defined(TARGET_X86) || defined(TARGET_WASM) // TODO: add arch for WASM
return ARCH_X86;
#else
#error Unidentified Architecture
Expand All@@ -71,7 +71,7 @@ int32_t SystemNative_GetProcessArchitecture()
return ARCH_ARM64;
#elif defined(TARGET_AMD64)
return ARCH_X64;
#elif defined(TARGET_X86)
#elif defined(TARGET_X86) || defined(TARGET_WASM) // TODO: add arch for WASM
return ARCH_X86;
#else
#error Unidentified Architecture
Expand Down
6 changes: 3 additions & 3 deletions src/libraries/Native/Unix/configure.cmake
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,8 @@ include(CheckTypeSize)

if (CLR_CMAKE_TARGET_ANDROID)
set(PAL_UNIX_NAME \"ANDROID\")
elseif (CLR_CMAKE_TARGET_ARCH_WASM)
set(PAL_UNIX_NAME \"WEBASSEMBLY\")
elseif (CLR_CMAKE_TARGET_LINUX)
set(PAL_UNIX_NAME \"LINUX\")
elseif (CLR_CMAKE_TARGET_OSX)
Expand All@@ -28,8 +30,6 @@ elseif (CLR_CMAKE_TARGET_FREEBSD)
set(CMAKE_REQUIRED_INCLUDES ${CROSS_ROOTFS}/usr/local/include)
elseif (CLR_CMAKE_TARGET_NETBSD)
set(PAL_UNIX_NAME \"NETBSD\")
elseif (CLR_CMAKE_TARGET_ARCH_WASM)
set(PAL_UNIX_NAME \"WEBASSEMBLY\")
else ()
message(FATAL_ERROR "Unknown platform. Cannot define PAL_UNIX_NAME, used by RuntimeInformation.")
endif ()
Expand DownExpand Up@@ -839,7 +839,7 @@ set (CMAKE_REQUIRED_LIBRARIES ${PREVIOUS_CMAKE_REQUIRED_LIBRARIES})
set (HAVE_INOTIFY 0)
if (HAVE_INOTIFY_INIT AND HAVE_INOTIFY_ADD_WATCH AND HAVE_INOTIFY_RM_WATCH)
set (HAVE_INOTIFY 1)
elseif (CLR_CMAKE_TARGET_LINUX)
elseif (CLR_CMAKE_TARGET_LINUX AND NOT CLR_CMAKE_TARGET_ARCH_WASM)
message(FATAL_ERROR "Cannot find inotify functions on a Linux platform.")
endif()

Expand Down
5 changes: 4 additions & 1 deletion src/libraries/Native/build-native.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,10 +49,13 @@ source "$__RepoRootDir"/eng/native/build-commons.sh

if [[ "$__BuildArch" == wasm ]]; then
if [[ -z "$EMSDK_PATH" ]]; then
echo "Error: Should set EMSDK_PATH environment variable pointing to emsdk root."
echo "Error: You need to set the EMSDK_PATH environment variable pointing to the emscripten SDK root."
exit 1
fi
source "$EMSDK_PATH"/emsdk_env.sh

export CLR_CC=$(which emcc)
export CLR_CXX=$(which em++)
Comment on lines +57 to +58

@am11am11Apr 13, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A nit, typically posix-y command -v is preferred over which in this repo. (same goes for which false below)

@akoeplingerakoeplingerApr 14, 2020•
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@am11 I tried that but it didn't work since we expect the full path in CLR_CC and command -v doesn't do that (for false at least)

elif [[ "$__TargetOS" == iOS ]]; then
# nothing to do here
true
Expand Down
3 changes: 2 additions & 1 deletion src/mono/Directory.Build.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,8 +42,9 @@
<TargetsiOSSimulator Condition="'$(TargetsiOS)' == 'true' and '$(Platform)' == 'x64'">true</TargetsiOSSimulator>
<TargetstvOSSimulator Condition="'$(TargetstvOS)' == 'true' and '$(Platform)' == 'x64'">true</TargetstvOSSimulator>
<TargetsAndroid Condition="'$(TargetOS)' == 'Android'">true</TargetsAndroid>
<TargetsWASM Condition="'$(TargetOS)' == 'WebAssembly'">true</TargetsWASM>
<TargetsWindows Condition="'$(TargetOS)' == 'Windows_NT'">true</TargetsWindows>
<TargetsUnix Condition="'$(TargetsFreeBSD)' == 'true' or '$(TargetsLinux)' == 'true' or '$(TargetsNetBSD)' == 'true' or '$(TargetsOSX)' == 'true' or '$(TargetstvOS)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetsAndroid)' == 'true'">true</TargetsUnix>
<TargetsUnix Condition="'$(TargetsFreeBSD)' == 'true' or '$(TargetsLinux)' == 'true' or '$(TargetsNetBSD)' == 'true' or '$(TargetsOSX)' == 'true' or '$(TargetstvOS)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetsAndroid)' == 'true' or '$(TargetsWASM)' == 'true'">true</TargetsUnix>
</PropertyGroup>

<PropertyGroup>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Add beginnings of WebAssembly build support for mono.#33551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

akoeplinger
merged 10 commits into

from

Apr 10, 2020
 Merged


Add beginnings of WebAssembly build support for mono.
#33551
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
7703390

Add beginnings of WebAssembly build support for mono.


vargaz Apr 3, 2020
b803077

Add beginnings of WebAssembly build support for mono.


vargaz Apr 3, 2020
5638e2b

Merge branch 'master' into wasm-build


akoeplinger Apr 7, 2020
03bd7da

Set emcc as the compiler for libraries build


akoeplinger Apr 7, 2020
9712249

Add default subsets for webassembly build


akoeplinger Apr 7, 2020
73d2a7c

Use WebAssembly Docker image


akoeplinger Apr 7, 2020
9e130dc

Fix various problems in the build


akoeplinger Apr 7, 2020
74819de

Merge remote-tracking branch 'upstream/master' into wasm-build


akoeplinger Apr 9, 2020
1da9cc8

Bump webassembly image


akoeplinger Apr 9, 2020
a4b955f

Use Mono runtime for webassembly builds


akoeplinger Apr 9, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
eng/Subsets.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@
 <PropertyGroup>
 <DefaultSubsets>clr+mono+libs+installer</DefaultSubsets>
 <DefaultSubsets Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'Android' or '$(TargetOS)' == 'tvOS'">mono+libs+installer</DefaultSubsets>
 <DefaultSubsetCategories Condition="'$(TargetOS)' == 'WebAssembly'">mono+libs</DefaultSubsetCategories>
 </PropertyGroup>

 <PropertyGroup>
Expand DownExpand Up@@ -66,7 +67,7 @@
 </PropertyGroup>

 <PropertyGroup>
 <RuntimeFlavor Condition="'$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'Android'">Mono</RuntimeFlavor>
 <RuntimeFlavor Condition="'$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'Android' or '$(TargetOS)' == 'WebAssembly'">Mono</RuntimeFlavor>
 <RuntimeFlavor Condition="'$(RuntimeFlavor)' == '' and $(_subset.Contains('+mono.runtime+')) and !$(_subset.Contains('+clr.runtime+'))">Mono</RuntimeFlavor>
 <RuntimeFlavor Condition="'$(RuntimeFlavor)' == ''">CoreCLR</RuntimeFlavor>
 </PropertyGroup>
Expand Down

9 changes: 7 additions & 2 deletions
eng/native/build-commons.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -151,8 +151,13 @@ build_native()

 popd
 else
 echo "Executing cmake --build \"$intermediatesDir\" --target install -j $__NumProc"
 cmake --build "$intermediatesDir" --target install -j "$__NumProc"
 cmake_command=cmake
 if [[ "$build_arch" == "wasm" ]]; then
 cmake_command="emcmake $cmake_command"
 fi

 echo "Executing $cmake_command --build \"$intermediatesDir\" --target install -j $__NumProc"
 $cmake_command --build "$intermediatesDir" --target install -j "$__NumProc"
 fi

 local exit_code="$?"
Expand Down

20 changes: 17 additions & 3 deletions
eng/native/configureplatform.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -166,7 +166,8 @@ if(CLR_CMAKE_HOST_OS STREQUAL Windows)
endif(CLR_CMAKE_HOST_OS STREQUAL Windows)

if(CLR_CMAKE_HOST_OS STREQUAL Emscripten)
 set(CLR_CMAKE_HOST_ARCH_WASM 1)
 #set(CLR_CMAKE_HOST_UNIX 1) # TODO: this should be reenabled but it activates a bunch of additional compiler flags in configurecompiler.cmake
 set(CLR_CMAKE_HOST_UNIX_WASM 1)
endif(CLR_CMAKE_HOST_OS STREQUAL Emscripten)

#--------------------------------------------
Expand DownExpand Up@@ -196,6 +197,9 @@ elseif(CLR_CMAKE_HOST_UNIX_AMD64)
elseif(CLR_CMAKE_HOST_UNIX_X86)
 set(CLR_CMAKE_HOST_ARCH_I386 1)
 set(CLR_CMAKE_HOST_ARCH "x86")
elseif(CLR_CMAKE_HOST_UNIX_WASM)
 set(CLR_CMAKE_HOST_ARCH_WASM 1)
 set(CLR_CMAKE_HOST_ARCH "wasm")
elseif(WIN32)
 # CLR_CMAKE_HOST_ARCH is passed in as param to cmake
 if (CLR_CMAKE_HOST_ARCH STREQUAL x64)
Expand DownExpand Up@@ -237,6 +241,8 @@ if (CLR_CMAKE_TARGET_ARCH STREQUAL x64)
 set(CLR_CMAKE_TARGET_ARCH_ARM 1)
 set(CLR_CMAKE_TARGET_ARCH_ARMV7L 1)
 set(ARM_SOFTFP 1)
 elseif(CLR_CMAKE_TARGET_ARCH STREQUAL wasm)
 set(CLR_CMAKE_TARGET_ARCH_WASM 1)
 else()
 clr_unknown_arch()
endif()
Expand DownExpand Up@@ -306,6 +312,12 @@ if(CLR_CMAKE_TARGET_OS STREQUAL SunOS)
 set(CLR_CMAKE_TARGET_SUNOS 1)
endif(CLR_CMAKE_TARGET_OS STREQUAL SunOS)

if(CLR_CMAKE_TARGET_OS STREQUAL Emscripten)
 set(CLR_CMAKE_TARGET_UNIX 1)
 set(CLR_CMAKE_TARGET_LINUX 1)
 set(CLR_CMAKE_TARGET_EMSCRIPTEN 1)
endif(CLR_CMAKE_TARGET_OS STREQUAL Emscripten)

if(CLR_CMAKE_TARGET_UNIX)
 if(CLR_CMAKE_TARGET_ARCH STREQUAL x64)
 set(CLR_CMAKE_TARGET_UNIX_AMD64 1)
Expand All@@ -317,6 +329,8 @@ if(CLR_CMAKE_TARGET_UNIX)
 set(CLR_CMAKE_TARGET_UNIX_ARM64 1)
 elseif(CLR_CMAKE_TARGET_ARCH STREQUAL x86)
 set(CLR_CMAKE_TARGET_UNIX_X86 1)
 elseif(CLR_CMAKE_TARGET_ARCH STREQUAL wasm)
 set(CLR_CMAKE_TARGET_UNIX_WASM 1)
 else()
 clr_unknown_arch()
 endif()
Expand All@@ -343,7 +357,7 @@ else()
 endif()
endif()

if(NOT CLR_CMAKE_HOST_ARCH_WASM)
if(NOT CLR_CMAKE_TARGET_EMSCRIPTEN)
 # Skip check_pie_supported call on Android as ld from llvm toolchain with NDK API level 21
 # complains about missing linker flag `-no-pie` (while level 28's ld does support this flag,
 # but since we know that PIE is supported, we can safely skip this redundant check).
Expand All@@ -363,7 +377,7 @@ if(NOT CLR_CMAKE_HOST_ARCH_WASM)
 endif(NOT CLR_CMAKE_TARGET_ANDROID)

 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
endif(NOT CLR_CMAKE_HOST_ARCH_WASM)
endif(NOT CLR_CMAKE_TARGET_EMSCRIPTEN)

string(TOLOWER "${CMAKE_BUILD_TYPE}" LOWERCASE_CMAKE_BUILD_TYPE)
if(LOWERCASE_CMAKE_BUILD_TYPE STREQUAL debug)
Expand Down

2 changes: 1 addition & 1 deletion
eng/native/configuretools.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ if (CMAKE_C_COMPILER MATCHES "-?[0-9]+(\.[0-9]+)?$")
 set(CLR_CMAKE_COMPILER_FILE_NAME_VERSION "${CMAKE_MATCH_0}")
endif()

if(NOT WIN32)
if(NOT WIN32 AND NOT CLR_CMAKE_TARGET_ARCH_WASM)
 if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 if(APPLE)
 set(TOOLSET_PREFIX "")
Expand Down

4 changes: 4 additions & 0 deletions
eng/native/gen-buildsys.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -87,6 +87,10 @@ if [[ "$scan_build" == "ON" && -n "$SCAN_BUILD_COMMAND" ]]; then
 cmake_command="$SCAN_BUILD_COMMAND $cmake_command"
fi

if [[ "$build_arch" == "wasm" ]]; then
 cmake_command="emcmake $cmake_command"
fi

# Include CMAKE_USER_MAKE_RULES_OVERRIDE as uninitialized since it will hold its value in the CMake cache otherwise can cause issues when branch switching
$cmake_command \
 -G "$generator" \
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/common/platform-matrix.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -169,7 +169,7 @@ jobs:
 archType: wasm
 platform: WebAssembly_wasm
 container:
 image: ubuntu-16.04-20200401182342-fe8b85d
 image: ubuntu-18.04-webassembly-20200409132031-f70ea41
 registry: mcr
 jobParameters:
 runtimeFlavor: ${{ parameters.runtimeFlavor }}
Expand Down

5 changes: 1 addition & 4 deletions
eng/pipelines/libraries/base-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,7 @@ jobs:
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubGroup, ''), eq(parameters.archType, 'arm')) }}:
 - _runtimeOSArg: /p:RuntimeOS=ubuntu.16.04

 # force a value for OS when cross-building WebAssembly
 - ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
 - _runtimeOSArg: -os ${{ parameters.osGroup }}

Expand DownExpand Up@@ -107,10 +108,6 @@ jobs:
 - _runtimeArtifactsPathArg: ' /p:RuntimeArtifactsPath=$(_runtimeDownloadPath)'
 - _testRunNamePrefixSuffix: $(runtimeFlavorName)_${{ parameters.liveRuntimeBuildConfig }}

 # WebAssembly uses linux implementation detail
 - ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
 - _runtimeArtifactName: 'CoreLib_Linux_x64_${{ parameters.liveRuntimeBuildConfig }}'

 # Windows variables
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 - _runtimeOSArg: /p:RuntimeOS=win10
Expand Down

24 changes: 6 additions & 18 deletions
eng/pipelines/libraries/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,21 +49,18 @@ jobs:

 ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}:
 dependsOn:
 - ${{ if ne(parameters.osGroup, 'WebAssembly') }}:
 # Use corelib dependencies for coreclr and non test builds
 - ${{ if and(eq(parameters.runtimeFlavor, 'coreclr'), eq(parameters.testScope, '')) }}:
 - ${{ format('coreclr_corelib_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}
 - ${{ if or(ne(parameters.runtimeFlavor, 'coreclr'), ne(parameters.testScope, '')) }}:
 - ${{ format('{0}_product_build_{1}{2}_{3}_{4}', parameters.runtimeFlavor, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}
 - ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
 - ${{ format('coreclr_corelib_build_{1}{2}_{3}_{4}', parameters.runtimeFlavor, 'linux', parameters.osSubgroup, 'x64', parameters.liveRuntimeBuildConfig) }}
 # Use corelib dependencies for coreclr and non test builds
 - ${{ if and(eq(parameters.runtimeFlavor, 'coreclr'), eq(parameters.testScope, '')) }}:
 - ${{ format('coreclr_corelib_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}
 - ${{ if or(ne(parameters.runtimeFlavor, 'coreclr'), ne(parameters.testScope, '')) }}:
 - ${{ format('{0}_product_build_{1}{2}_{3}_{4}', parameters.runtimeFlavor, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}

 variables:
 - _subset: libs
 - _addtionalBuildArguments: ''
 - ${{ parameters.variables }}
 - ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
 - EMSDK_PATH: $(Build.BinariesDirectory)/emsdk
 - EMSDK_PATH: /usr/local/emscripten
Comment thread
vargaz marked this conversation as resolved.

 - ${{ if eq(parameters.runTests, true) }}:
 - _subset: libs+libs.tests
 - _addtionalBuildArguments: /p:ArchiveTests=true
Expand All@@ -80,15 +77,6 @@ jobs:
 ln -s /usr/local/opt/openssl/lib/pkgconfig/openssl.pc /usr/local/lib/pkgconfig/
 displayName: Install Build Dependencies

 - ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
 - script: |
 EMSCRIPTEN_VERSION=1.38.47
 git clone https://github.com/emscripten-core/emsdk.git $(EMSDK_PATH)
 cd $(EMSDK_PATH)
 ./emsdk install ${EMSCRIPTEN_VERSION}-upstream
 ./emsdk activate --embedded ${EMSCRIPTEN_VERSION}-upstream
 displayName: Install Emscripten

 - ${{ if eq(parameters.isOfficialBuild, true) }}:
 - template: /eng/pipelines/common/restore-internal-tools.yml
 parameters:
Expand Down

7 changes: 7 additions & 0 deletions
eng/pipelines/mono/templates/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,13 @@ jobs:
 - ${{ if eq(parameters.osGroup, 'Android') }}:
 - name: osOverride
 value: -os Android
 - ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
 - name: EMSDK_PATH
 value: /usr/local/emscripten
 - name: archType
 value: wasm
 - name: osOverride
 value: '-os WebAssembly'
 - ${{ parameters.variables }}

 steps:
Expand Down

5 changes: 4 additions & 1 deletion
eng/pipelines/runtime.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -266,6 +266,7 @@ jobs:
 - Linux_arm
 - Linux_arm64
 - Linux_musl_x64
 - WebAssembly_wasm
 # - Linux_musl_arm64
 - Windows_NT_x64
 # - Windows_NT_x86
Expand DownExpand Up@@ -302,6 +303,7 @@ jobs:
 - Linux_arm
 - Linux_arm64
 - Linux_musl_x64
 - WebAssembly_wasm
 # - Linux_musl_arm64
 - Windows_NT_x64
 # - Windows_NT_x86
Expand DownExpand Up@@ -420,6 +422,7 @@ jobs:
 # - iOS_arm # https://github.com/dotnet/runtime/issues/34465
 - iOS_arm64
 - iOS_x64
 - WebAssembly_wasm
 jobParameters:
 liveRuntimeBuildConfig: release

Expand All@@ -438,6 +441,7 @@ jobs:
 # - iOS_arm # https://github.com/dotnet/runtime/issues/34465
 - iOS_arm64
 - iOS_x64
 - WebAssembly_wasm
 jobParameters:
 liveRuntimeBuildConfig: debug

Expand All@@ -449,7 +453,6 @@ jobs:
 jobTemplate: /eng/pipelines/libraries/build-job.yml
 buildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
 platforms:
 - WebAssembly_wasm
 - ${{ if eq(variables['isFullMatrix'], false) }}:
 - Windows_NT_x86
 jobParameters:
Expand Down

3 changes: 3 additions & 0 deletions
src/libraries/Native/Unix/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,9 @@ elseif (CLR_CMAKE_TARGET_ARCH_I386)
 add_definitions(-DTARGET_32BIT=1)
 add_definitions(-DTARGET_X86)
 add_definitions(-D_FILE_OFFSET_BITS=64)
elseif (CLR_CMAKE_TARGET_ARCH_WASM)
 add_definitions(-DTARGET_32BIT=1)
 add_definitions(-DTARGET_WASM)
elseif (CLR_CMAKE_TARGET_ARCH_ARM64)
 add_definitions(-DTARGET_64BIT=1)
 add_definitions(-DTARGET_ARM64)
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/Native/Unix/System.IO.Compression.Native/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
project(System.IO.Compression.Native C)

if (CLR_CMAKE_TARGET_WASM)
if (CLR_CMAKE_TARGET_ARCH_WASM)
 add_definitions(-s USE_ZLIB)
elseif (CLR_CMAKE_TARGET_ANDROID)
 # need special case here since we want to link against libz.so but find_package() would resolve libz.a
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/Native/Unix/System.Native/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ else ()
 set(NATIVE_SOURCES ${NATIVE_SOURCES} pal_console.c)
endif ()

if (CLR_CMAKE_TARGET_LINUX)
if (CLR_CMAKE_TARGET_LINUX AND NOT CLR_CMAKE_TARGET_ARCH_WASM)
 set(NATIVE_SOURCES ${NATIVE_SOURCES} pal_networkchange.c)

 if (!HAVE_LINUX_RTNETLINK_H)
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/Native/Unix/System.Native/pal_runtimeinformation.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ int32_t SystemNative_GetOSArchitecture()
 return ARCH_ARM64;
#elif defined(TARGET_AMD64)
 return ARCH_X64;
#elif defined(TARGET_X86)
#elif defined(TARGET_X86) || defined(TARGET_WASM) // TODO: add arch for WASM
 return ARCH_X86;
#else
#error Unidentified Architecture
Expand All@@ -71,7 +71,7 @@ int32_t SystemNative_GetProcessArchitecture()
 return ARCH_ARM64;
#elif defined(TARGET_AMD64)
 return ARCH_X64;
#elif defined(TARGET_X86)
#elif defined(TARGET_X86) || defined(TARGET_WASM) // TODO: add arch for WASM
 return ARCH_X86;
#else
#error Unidentified Architecture
Expand Down

6 changes: 3 additions & 3 deletions
src/libraries/Native/Unix/configure.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,8 @@ include(CheckTypeSize)

if (CLR_CMAKE_TARGET_ANDROID)
 set(PAL_UNIX_NAME \"ANDROID\")
elseif (CLR_CMAKE_TARGET_ARCH_WASM)
 set(PAL_UNIX_NAME \"WEBASSEMBLY\")
elseif (CLR_CMAKE_TARGET_LINUX)
 set(PAL_UNIX_NAME \"LINUX\")
elseif (CLR_CMAKE_TARGET_OSX)
Expand All@@ -28,8 +30,6 @@ elseif (CLR_CMAKE_TARGET_FREEBSD)
 set(CMAKE_REQUIRED_INCLUDES ${CROSS_ROOTFS}/usr/local/include)
elseif (CLR_CMAKE_TARGET_NETBSD)
 set(PAL_UNIX_NAME \"NETBSD\")
elseif (CLR_CMAKE_TARGET_ARCH_WASM)
 set(PAL_UNIX_NAME \"WEBASSEMBLY\")
else ()
 message(FATAL_ERROR "Unknown platform. Cannot define PAL_UNIX_NAME, used by RuntimeInformation.")
endif ()
Expand DownExpand Up@@ -839,7 +839,7 @@ set (CMAKE_REQUIRED_LIBRARIES ${PREVIOUS_CMAKE_REQUIRED_LIBRARIES})
set (HAVE_INOTIFY 0)
if (HAVE_INOTIFY_INIT AND HAVE_INOTIFY_ADD_WATCH AND HAVE_INOTIFY_RM_WATCH)
 set (HAVE_INOTIFY 1)
elseif (CLR_CMAKE_TARGET_LINUX)
elseif (CLR_CMAKE_TARGET_LINUX AND NOT CLR_CMAKE_TARGET_ARCH_WASM)
 message(FATAL_ERROR "Cannot find inotify functions on a Linux platform.")
endif()

Expand Down

5 changes: 4 additions & 1 deletion
src/libraries/Native/build-native.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,10 +49,13 @@ source "$__RepoRootDir"/eng/native/build-commons.sh

if [[ "$__BuildArch" == wasm ]]; then
 if [[ -z "$EMSDK_PATH" ]]; then
 echo "Error: Should set EMSDK_PATH environment variable pointing to emsdk root."
 echo "Error: You need to set the EMSDK_PATH environment variable pointing to the emscripten SDK root."
 exit 1
 fi
 source "$EMSDK_PATH"/emsdk_env.sh

 export CLR_CC=$(which emcc)
 export CLR_CXX=$(which em++)

Comment on lines

+57
 to 
+58

@am11am11Apr 13, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A nit, typically posix-y command -v is preferred over which in this repo. (same goes for which false below)
@akoeplingerakoeplingerApr 14, 2020•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@am11 I tried that but it didn't work since we expect the full path in CLR_CC and command -v doesn't do that (for false at least)
elif [[ "$__TargetOS" == iOS ]]; then
 # nothing to do here
 true
Expand Down

3 changes: 2 additions & 1 deletion
src/mono/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,8 +42,9 @@
 <TargetsiOSSimulator Condition="'$(TargetsiOS)' == 'true' and '$(Platform)' == 'x64'">true</TargetsiOSSimulator>
 <TargetstvOSSimulator Condition="'$(TargetstvOS)' == 'true' and '$(Platform)' == 'x64'">true</TargetstvOSSimulator>
 <TargetsAndroid Condition="'$(TargetOS)' == 'Android'">true</TargetsAndroid>
 <TargetsWASM Condition="'$(TargetOS)' == 'WebAssembly'">true</TargetsWASM>
 <TargetsWindows Condition="'$(TargetOS)' == 'Windows_NT'">true</TargetsWindows>
 <TargetsUnix Condition="'$(TargetsFreeBSD)' == 'true' or '$(TargetsLinux)' == 'true' or '$(TargetsNetBSD)' == 'true' or '$(TargetsOSX)' == 'true' or '$(TargetstvOS)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetsAndroid)' == 'true'">true</TargetsUnix>
 <TargetsUnix Condition="'$(TargetsFreeBSD)' == 'true' or '$(TargetsLinux)' == 'true' or '$(TargetsNetBSD)' == 'true' or '$(TargetsOSX)' == 'true' or '$(TargetstvOS)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetsAndroid)' == 'true' or '$(TargetsWASM)' == 'true'">true</TargetsUnix>
 </PropertyGroup>

 <PropertyGroup>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add beginnings of WebAssembly build support for mono.#33551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

akoeplinger
merged 10 commits into

from

Apr 10, 2020
 Merged


Add beginnings of WebAssembly build support for mono.
#33551
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
7703390

Add beginnings of WebAssembly build support for mono.


vargaz Apr 3, 2020
b803077

Add beginnings of WebAssembly build support for mono.


vargaz Apr 3, 2020
5638e2b

Merge branch 'master' into wasm-build


akoeplinger Apr 7, 2020
03bd7da

Set emcc as the compiler for libraries build


akoeplinger Apr 7, 2020
9712249

Add default subsets for webassembly build


akoeplinger Apr 7, 2020
73d2a7c

Use WebAssembly Docker image


akoeplinger Apr 7, 2020
9e130dc

Fix various problems in the build


akoeplinger Apr 7, 2020
74819de

Merge remote-tracking branch 'upstream/master' into wasm-build


akoeplinger Apr 9, 2020
1da9cc8

Bump webassembly image


akoeplinger Apr 9, 2020
a4b955f

Use Mono runtime for webassembly builds


akoeplinger Apr 9, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
eng/Subsets.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@
 <PropertyGroup>
 <DefaultSubsets>clr+mono+libs+installer</DefaultSubsets>
 <DefaultSubsets Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'Android' or '$(TargetOS)' == 'tvOS'">mono+libs+installer</DefaultSubsets>
 <DefaultSubsetCategories Condition="'$(TargetOS)' == 'WebAssembly'">mono+libs</DefaultSubsetCategories>
 </PropertyGroup>

 <PropertyGroup>
Expand DownExpand Up@@ -66,7 +67,7 @@
 </PropertyGroup>

 <PropertyGroup>
 <RuntimeFlavor Condition="'$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'Android'">Mono</RuntimeFlavor>
 <RuntimeFlavor Condition="'$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'Android' or '$(TargetOS)' == 'WebAssembly'">Mono</RuntimeFlavor>
 <RuntimeFlavor Condition="'$(RuntimeFlavor)' == '' and $(_subset.Contains('+mono.runtime+')) and !$(_subset.Contains('+clr.runtime+'))">Mono</RuntimeFlavor>
 <RuntimeFlavor Condition="'$(RuntimeFlavor)' == ''">CoreCLR</RuntimeFlavor>
 </PropertyGroup>
Expand Down

9 changes: 7 additions & 2 deletions
eng/native/build-commons.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -151,8 +151,13 @@ build_native()

 popd
 else
 echo "Executing cmake --build \"$intermediatesDir\" --target install -j $__NumProc"
 cmake --build "$intermediatesDir" --target install -j "$__NumProc"
 cmake_command=cmake
 if [[ "$build_arch" == "wasm" ]]; then
 cmake_command="emcmake $cmake_command"
 fi

 echo "Executing $cmake_command --build \"$intermediatesDir\" --target install -j $__NumProc"
 $cmake_command --build "$intermediatesDir" --target install -j "$__NumProc"
 fi

 local exit_code="$?"
Expand Down

20 changes: 17 additions & 3 deletions
eng/native/configureplatform.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -166,7 +166,8 @@ if(CLR_CMAKE_HOST_OS STREQUAL Windows)
endif(CLR_CMAKE_HOST_OS STREQUAL Windows)

if(CLR_CMAKE_HOST_OS STREQUAL Emscripten)
 set(CLR_CMAKE_HOST_ARCH_WASM 1)
 #set(CLR_CMAKE_HOST_UNIX 1) # TODO: this should be reenabled but it activates a bunch of additional compiler flags in configurecompiler.cmake
 set(CLR_CMAKE_HOST_UNIX_WASM 1)
endif(CLR_CMAKE_HOST_OS STREQUAL Emscripten)

#--------------------------------------------
Expand DownExpand Up@@ -196,6 +197,9 @@ elseif(CLR_CMAKE_HOST_UNIX_AMD64)
elseif(CLR_CMAKE_HOST_UNIX_X86)
 set(CLR_CMAKE_HOST_ARCH_I386 1)
 set(CLR_CMAKE_HOST_ARCH "x86")
elseif(CLR_CMAKE_HOST_UNIX_WASM)
 set(CLR_CMAKE_HOST_ARCH_WASM 1)
 set(CLR_CMAKE_HOST_ARCH "wasm")
elseif(WIN32)
 # CLR_CMAKE_HOST_ARCH is passed in as param to cmake
 if (CLR_CMAKE_HOST_ARCH STREQUAL x64)
Expand DownExpand Up@@ -237,6 +241,8 @@ if (CLR_CMAKE_TARGET_ARCH STREQUAL x64)
 set(CLR_CMAKE_TARGET_ARCH_ARM 1)
 set(CLR_CMAKE_TARGET_ARCH_ARMV7L 1)
 set(ARM_SOFTFP 1)
 elseif(CLR_CMAKE_TARGET_ARCH STREQUAL wasm)
 set(CLR_CMAKE_TARGET_ARCH_WASM 1)
 else()
 clr_unknown_arch()
endif()
Expand DownExpand Up@@ -306,6 +312,12 @@ if(CLR_CMAKE_TARGET_OS STREQUAL SunOS)
 set(CLR_CMAKE_TARGET_SUNOS 1)
endif(CLR_CMAKE_TARGET_OS STREQUAL SunOS)

if(CLR_CMAKE_TARGET_OS STREQUAL Emscripten)
 set(CLR_CMAKE_TARGET_UNIX 1)
 set(CLR_CMAKE_TARGET_LINUX 1)
 set(CLR_CMAKE_TARGET_EMSCRIPTEN 1)
endif(CLR_CMAKE_TARGET_OS STREQUAL Emscripten)

if(CLR_CMAKE_TARGET_UNIX)
 if(CLR_CMAKE_TARGET_ARCH STREQUAL x64)
 set(CLR_CMAKE_TARGET_UNIX_AMD64 1)
Expand All@@ -317,6 +329,8 @@ if(CLR_CMAKE_TARGET_UNIX)
 set(CLR_CMAKE_TARGET_UNIX_ARM64 1)
 elseif(CLR_CMAKE_TARGET_ARCH STREQUAL x86)
 set(CLR_CMAKE_TARGET_UNIX_X86 1)
 elseif(CLR_CMAKE_TARGET_ARCH STREQUAL wasm)
 set(CLR_CMAKE_TARGET_UNIX_WASM 1)
 else()
 clr_unknown_arch()
 endif()
Expand All@@ -343,7 +357,7 @@ else()
 endif()
endif()

if(NOT CLR_CMAKE_HOST_ARCH_WASM)
if(NOT CLR_CMAKE_TARGET_EMSCRIPTEN)
 # Skip check_pie_supported call on Android as ld from llvm toolchain with NDK API level 21
 # complains about missing linker flag `-no-pie` (while level 28's ld does support this flag,
 # but since we know that PIE is supported, we can safely skip this redundant check).
Expand All@@ -363,7 +377,7 @@ if(NOT CLR_CMAKE_HOST_ARCH_WASM)
 endif(NOT CLR_CMAKE_TARGET_ANDROID)

 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
endif(NOT CLR_CMAKE_HOST_ARCH_WASM)
endif(NOT CLR_CMAKE_TARGET_EMSCRIPTEN)

string(TOLOWER "${CMAKE_BUILD_TYPE}" LOWERCASE_CMAKE_BUILD_TYPE)
if(LOWERCASE_CMAKE_BUILD_TYPE STREQUAL debug)
Expand Down

2 changes: 1 addition & 1 deletion
eng/native/configuretools.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ if (CMAKE_C_COMPILER MATCHES "-?[0-9]+(\.[0-9]+)?$")
 set(CLR_CMAKE_COMPILER_FILE_NAME_VERSION "${CMAKE_MATCH_0}")
endif()

if(NOT WIN32)
if(NOT WIN32 AND NOT CLR_CMAKE_TARGET_ARCH_WASM)
 if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 if(APPLE)
 set(TOOLSET_PREFIX "")
Expand Down

4 changes: 4 additions & 0 deletions
eng/native/gen-buildsys.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -87,6 +87,10 @@ if [[ "$scan_build" == "ON" && -n "$SCAN_BUILD_COMMAND" ]]; then
 cmake_command="$SCAN_BUILD_COMMAND $cmake_command"
fi

if [[ "$build_arch" == "wasm" ]]; then
 cmake_command="emcmake $cmake_command"
fi

# Include CMAKE_USER_MAKE_RULES_OVERRIDE as uninitialized since it will hold its value in the CMake cache otherwise can cause issues when branch switching
$cmake_command \
 -G "$generator" \
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/common/platform-matrix.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -169,7 +169,7 @@ jobs:
 archType: wasm
 platform: WebAssembly_wasm
 container:
 image: ubuntu-16.04-20200401182342-fe8b85d
 image: ubuntu-18.04-webassembly-20200409132031-f70ea41
 registry: mcr
 jobParameters:
 runtimeFlavor: ${{ parameters.runtimeFlavor }}
Expand Down

5 changes: 1 addition & 4 deletions
eng/pipelines/libraries/base-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,7 @@ jobs:
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubGroup, ''), eq(parameters.archType, 'arm')) }}:
 - _runtimeOSArg: /p:RuntimeOS=ubuntu.16.04

 # force a value for OS when cross-building WebAssembly
 - ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
 - _runtimeOSArg: -os ${{ parameters.osGroup }}

Expand DownExpand Up@@ -107,10 +108,6 @@ jobs:
 - _runtimeArtifactsPathArg: ' /p:RuntimeArtifactsPath=$(_runtimeDownloadPath)'
 - _testRunNamePrefixSuffix: $(runtimeFlavorName)_${{ parameters.liveRuntimeBuildConfig }}

 # WebAssembly uses linux implementation detail
 - ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
 - _runtimeArtifactName: 'CoreLib_Linux_x64_${{ parameters.liveRuntimeBuildConfig }}'

 # Windows variables
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 - _runtimeOSArg: /p:RuntimeOS=win10
Expand Down

24 changes: 6 additions & 18 deletions
eng/pipelines/libraries/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,21 +49,18 @@ jobs:

 ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}:
 dependsOn:
 - ${{ if ne(parameters.osGroup, 'WebAssembly') }}:
 # Use corelib dependencies for coreclr and non test builds
 - ${{ if and(eq(parameters.runtimeFlavor, 'coreclr'), eq(parameters.testScope, '')) }}:
 - ${{ format('coreclr_corelib_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}
 - ${{ if or(ne(parameters.runtimeFlavor, 'coreclr'), ne(parameters.testScope, '')) }}:
 - ${{ format('{0}_product_build_{1}{2}_{3}_{4}', parameters.runtimeFlavor, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}
 - ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
 - ${{ format('coreclr_corelib_build_{1}{2}_{3}_{4}', parameters.runtimeFlavor, 'linux', parameters.osSubgroup, 'x64', parameters.liveRuntimeBuildConfig) }}
 # Use corelib dependencies for coreclr and non test builds
 - ${{ if and(eq(parameters.runtimeFlavor, 'coreclr'), eq(parameters.testScope, '')) }}:
 - ${{ format('coreclr_corelib_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}
 - ${{ if or(ne(parameters.runtimeFlavor, 'coreclr'), ne(parameters.testScope, '')) }}:
 - ${{ format('{0}_product_build_{1}{2}_{3}_{4}', parameters.runtimeFlavor, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}

 variables:
 - _subset: libs
 - _addtionalBuildArguments: ''
 - ${{ parameters.variables }}
 - ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
 - EMSDK_PATH: $(Build.BinariesDirectory)/emsdk
 - EMSDK_PATH: /usr/local/emscripten
Comment thread
vargaz marked this conversation as resolved.

 - ${{ if eq(parameters.runTests, true) }}:
 - _subset: libs+libs.tests
 - _addtionalBuildArguments: /p:ArchiveTests=true
Expand All@@ -80,15 +77,6 @@ jobs:
 ln -s /usr/local/opt/openssl/lib/pkgconfig/openssl.pc /usr/local/lib/pkgconfig/
 displayName: Install Build Dependencies

 - ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
 - script: |
 EMSCRIPTEN_VERSION=1.38.47
 git clone https://github.com/emscripten-core/emsdk.git $(EMSDK_PATH)
 cd $(EMSDK_PATH)
 ./emsdk install ${EMSCRIPTEN_VERSION}-upstream
 ./emsdk activate --embedded ${EMSCRIPTEN_VERSION}-upstream
 displayName: Install Emscripten

 - ${{ if eq(parameters.isOfficialBuild, true) }}:
 - template: /eng/pipelines/common/restore-internal-tools.yml
 parameters:
Expand Down

7 changes: 7 additions & 0 deletions
eng/pipelines/mono/templates/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,13 @@ jobs:
 - ${{ if eq(parameters.osGroup, 'Android') }}:
 - name: osOverride
 value: -os Android
 - ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
 - name: EMSDK_PATH
 value: /usr/local/emscripten
 - name: archType
 value: wasm
 - name: osOverride
 value: '-os WebAssembly'
 - ${{ parameters.variables }}

 steps:
Expand Down

5 changes: 4 additions & 1 deletion
eng/pipelines/runtime.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -266,6 +266,7 @@ jobs:
 - Linux_arm
 - Linux_arm64
 - Linux_musl_x64
 - WebAssembly_wasm
 # - Linux_musl_arm64
 - Windows_NT_x64
 # - Windows_NT_x86
Expand DownExpand Up@@ -302,6 +303,7 @@ jobs:
 - Linux_arm
 - Linux_arm64
 - Linux_musl_x64
 - WebAssembly_wasm
 # - Linux_musl_arm64
 - Windows_NT_x64
 # - Windows_NT_x86
Expand DownExpand Up@@ -420,6 +422,7 @@ jobs:
 # - iOS_arm # https://github.com/dotnet/runtime/issues/34465
 - iOS_arm64
 - iOS_x64
 - WebAssembly_wasm
 jobParameters:
 liveRuntimeBuildConfig: release

Expand All@@ -438,6 +441,7 @@ jobs:
 # - iOS_arm # https://github.com/dotnet/runtime/issues/34465
 - iOS_arm64
 - iOS_x64
 - WebAssembly_wasm
 jobParameters:
 liveRuntimeBuildConfig: debug

Expand All@@ -449,7 +453,6 @@ jobs:
 jobTemplate: /eng/pipelines/libraries/build-job.yml
 buildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
 platforms:
 - WebAssembly_wasm
 - ${{ if eq(variables['isFullMatrix'], false) }}:
 - Windows_NT_x86
 jobParameters:
Expand Down

3 changes: 3 additions & 0 deletions
src/libraries/Native/Unix/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,9 @@ elseif (CLR_CMAKE_TARGET_ARCH_I386)
 add_definitions(-DTARGET_32BIT=1)
 add_definitions(-DTARGET_X86)
 add_definitions(-D_FILE_OFFSET_BITS=64)
elseif (CLR_CMAKE_TARGET_ARCH_WASM)
 add_definitions(-DTARGET_32BIT=1)
 add_definitions(-DTARGET_WASM)
elseif (CLR_CMAKE_TARGET_ARCH_ARM64)
 add_definitions(-DTARGET_64BIT=1)
 add_definitions(-DTARGET_ARM64)
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/Native/Unix/System.IO.Compression.Native/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
project(System.IO.Compression.Native C)

if (CLR_CMAKE_TARGET_WASM)
if (CLR_CMAKE_TARGET_ARCH_WASM)
 add_definitions(-s USE_ZLIB)
elseif (CLR_CMAKE_TARGET_ANDROID)
 # need special case here since we want to link against libz.so but find_package() would resolve libz.a
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/Native/Unix/System.Native/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ else ()
 set(NATIVE_SOURCES ${NATIVE_SOURCES} pal_console.c)
endif ()

if (CLR_CMAKE_TARGET_LINUX)
if (CLR_CMAKE_TARGET_LINUX AND NOT CLR_CMAKE_TARGET_ARCH_WASM)
 set(NATIVE_SOURCES ${NATIVE_SOURCES} pal_networkchange.c)

 if (!HAVE_LINUX_RTNETLINK_H)
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/Native/Unix/System.Native/pal_runtimeinformation.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ int32_t SystemNative_GetOSArchitecture()
 return ARCH_ARM64;
#elif defined(TARGET_AMD64)
 return ARCH_X64;
#elif defined(TARGET_X86)
#elif defined(TARGET_X86) || defined(TARGET_WASM) // TODO: add arch for WASM
 return ARCH_X86;
#else
#error Unidentified Architecture
Expand All@@ -71,7 +71,7 @@ int32_t SystemNative_GetProcessArchitecture()
 return ARCH_ARM64;
#elif defined(TARGET_AMD64)
 return ARCH_X64;
#elif defined(TARGET_X86)
#elif defined(TARGET_X86) || defined(TARGET_WASM) // TODO: add arch for WASM
 return ARCH_X86;
#else
#error Unidentified Architecture
Expand Down

6 changes: 3 additions & 3 deletions
src/libraries/Native/Unix/configure.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,8 @@ include(CheckTypeSize)

if (CLR_CMAKE_TARGET_ANDROID)
 set(PAL_UNIX_NAME \"ANDROID\")
elseif (CLR_CMAKE_TARGET_ARCH_WASM)
 set(PAL_UNIX_NAME \"WEBASSEMBLY\")
elseif (CLR_CMAKE_TARGET_LINUX)
 set(PAL_UNIX_NAME \"LINUX\")
elseif (CLR_CMAKE_TARGET_OSX)
Expand All@@ -28,8 +30,6 @@ elseif (CLR_CMAKE_TARGET_FREEBSD)
 set(CMAKE_REQUIRED_INCLUDES ${CROSS_ROOTFS}/usr/local/include)
elseif (CLR_CMAKE_TARGET_NETBSD)
 set(PAL_UNIX_NAME \"NETBSD\")
elseif (CLR_CMAKE_TARGET_ARCH_WASM)
 set(PAL_UNIX_NAME \"WEBASSEMBLY\")
else ()
 message(FATAL_ERROR "Unknown platform. Cannot define PAL_UNIX_NAME, used by RuntimeInformation.")
endif ()
Expand DownExpand Up@@ -839,7 +839,7 @@ set (CMAKE_REQUIRED_LIBRARIES ${PREVIOUS_CMAKE_REQUIRED_LIBRARIES})
set (HAVE_INOTIFY 0)
if (HAVE_INOTIFY_INIT AND HAVE_INOTIFY_ADD_WATCH AND HAVE_INOTIFY_RM_WATCH)
 set (HAVE_INOTIFY 1)
elseif (CLR_CMAKE_TARGET_LINUX)
elseif (CLR_CMAKE_TARGET_LINUX AND NOT CLR_CMAKE_TARGET_ARCH_WASM)
 message(FATAL_ERROR "Cannot find inotify functions on a Linux platform.")
endif()

Expand Down

5 changes: 4 additions & 1 deletion
src/libraries/Native/build-native.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,10 +49,13 @@ source "$__RepoRootDir"/eng/native/build-commons.sh

if [[ "$__BuildArch" == wasm ]]; then
 if [[ -z "$EMSDK_PATH" ]]; then
 echo "Error: Should set EMSDK_PATH environment variable pointing to emsdk root."
 echo "Error: You need to set the EMSDK_PATH environment variable pointing to the emscripten SDK root."
 exit 1
 fi
 source "$EMSDK_PATH"/emsdk_env.sh

 export CLR_CC=$(which emcc)
 export CLR_CXX=$(which em++)

Comment on lines

+57
 to 
+58

@am11am11Apr 13, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A nit, typically posix-y command -v is preferred over which in this repo. (same goes for which false below)
@akoeplingerakoeplingerApr 14, 2020•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@am11 I tried that but it didn't work since we expect the full path in CLR_CC and command -v doesn't do that (for false at least)
elif [[ "$__TargetOS" == iOS ]]; then
 # nothing to do here
 true
Expand Down

3 changes: 2 additions & 1 deletion
src/mono/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,8 +42,9 @@
 <TargetsiOSSimulator Condition="'$(TargetsiOS)' == 'true' and '$(Platform)' == 'x64'">true</TargetsiOSSimulator>
 <TargetstvOSSimulator Condition="'$(TargetstvOS)' == 'true' and '$(Platform)' == 'x64'">true</TargetstvOSSimulator>
 <TargetsAndroid Condition="'$(TargetOS)' == 'Android'">true</TargetsAndroid>
 <TargetsWASM Condition="'$(TargetOS)' == 'WebAssembly'">true</TargetsWASM>
 <TargetsWindows Condition="'$(TargetOS)' == 'Windows_NT'">true</TargetsWindows>
 <TargetsUnix Condition="'$(TargetsFreeBSD)' == 'true' or '$(TargetsLinux)' == 'true' or '$(TargetsNetBSD)' == 'true' or '$(TargetsOSX)' == 'true' or '$(TargetstvOS)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetsAndroid)' == 'true'">true</TargetsUnix>
 <TargetsUnix Condition="'$(TargetsFreeBSD)' == 'true' or '$(TargetsLinux)' == 'true' or '$(TargetsNetBSD)' == 'true' or '$(TargetsOSX)' == 'true' or '$(TargetstvOS)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetsAndroid)' == 'true' or '$(TargetsWASM)' == 'true'">true</TargetsUnix>
 </PropertyGroup>

 <PropertyGroup>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add beginnings of WebAssembly build support for mono.#33551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

akoeplinger
merged 10 commits into

from

Apr 10, 2020
 Merged


Add beginnings of WebAssembly build support for mono.
#33551
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
7703390

Add beginnings of WebAssembly build support for mono.


vargaz Apr 3, 2020
b803077

Add beginnings of WebAssembly build support for mono.


vargaz Apr 3, 2020
5638e2b

Merge branch 'master' into wasm-build


akoeplinger Apr 7, 2020
03bd7da

Set emcc as the compiler for libraries build


akoeplinger Apr 7, 2020
9712249

Add default subsets for webassembly build


akoeplinger Apr 7, 2020
73d2a7c

Use WebAssembly Docker image


akoeplinger Apr 7, 2020
9e130dc

Fix various problems in the build


akoeplinger Apr 7, 2020
74819de

Merge remote-tracking branch 'upstream/master' into wasm-build


akoeplinger Apr 9, 2020
1da9cc8

Bump webassembly image


akoeplinger Apr 9, 2020
a4b955f

Use Mono runtime for webassembly builds


akoeplinger Apr 9, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
eng/Subsets.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@
 <PropertyGroup>
 <DefaultSubsets>clr+mono+libs+installer</DefaultSubsets>
 <DefaultSubsets Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'Android' or '$(TargetOS)' == 'tvOS'">mono+libs+installer</DefaultSubsets>
 <DefaultSubsetCategories Condition="'$(TargetOS)' == 'WebAssembly'">mono+libs</DefaultSubsetCategories>
 </PropertyGroup>

 <PropertyGroup>
Expand DownExpand Up@@ -66,7 +67,7 @@
 </PropertyGroup>

 <PropertyGroup>
 <RuntimeFlavor Condition="'$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'Android'">Mono</RuntimeFlavor>
 <RuntimeFlavor Condition="'$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'Android' or '$(TargetOS)' == 'WebAssembly'">Mono</RuntimeFlavor>
 <RuntimeFlavor Condition="'$(RuntimeFlavor)' == '' and $(_subset.Contains('+mono.runtime+')) and !$(_subset.Contains('+clr.runtime+'))">Mono</RuntimeFlavor>
 <RuntimeFlavor Condition="'$(RuntimeFlavor)' == ''">CoreCLR</RuntimeFlavor>
 </PropertyGroup>
Expand Down

9 changes: 7 additions & 2 deletions
eng/native/build-commons.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -151,8 +151,13 @@ build_native()

 popd
 else
 echo "Executing cmake --build \"$intermediatesDir\" --target install -j $__NumProc"
 cmake --build "$intermediatesDir" --target install -j "$__NumProc"
 cmake_command=cmake
 if [[ "$build_arch" == "wasm" ]]; then
 cmake_command="emcmake $cmake_command"
 fi

 echo "Executing $cmake_command --build \"$intermediatesDir\" --target install -j $__NumProc"
 $cmake_command --build "$intermediatesDir" --target install -j "$__NumProc"
 fi

 local exit_code="$?"
Expand Down

20 changes: 17 additions & 3 deletions
eng/native/configureplatform.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -166,7 +166,8 @@ if(CLR_CMAKE_HOST_OS STREQUAL Windows)
endif(CLR_CMAKE_HOST_OS STREQUAL Windows)

if(CLR_CMAKE_HOST_OS STREQUAL Emscripten)
 set(CLR_CMAKE_HOST_ARCH_WASM 1)
 #set(CLR_CMAKE_HOST_UNIX 1) # TODO: this should be reenabled but it activates a bunch of additional compiler flags in configurecompiler.cmake
 set(CLR_CMAKE_HOST_UNIX_WASM 1)
endif(CLR_CMAKE_HOST_OS STREQUAL Emscripten)

#--------------------------------------------
Expand DownExpand Up@@ -196,6 +197,9 @@ elseif(CLR_CMAKE_HOST_UNIX_AMD64)
elseif(CLR_CMAKE_HOST_UNIX_X86)
 set(CLR_CMAKE_HOST_ARCH_I386 1)
 set(CLR_CMAKE_HOST_ARCH "x86")
elseif(CLR_CMAKE_HOST_UNIX_WASM)
 set(CLR_CMAKE_HOST_ARCH_WASM 1)
 set(CLR_CMAKE_HOST_ARCH "wasm")
elseif(WIN32)
 # CLR_CMAKE_HOST_ARCH is passed in as param to cmake
 if (CLR_CMAKE_HOST_ARCH STREQUAL x64)
Expand DownExpand Up@@ -237,6 +241,8 @@ if (CLR_CMAKE_TARGET_ARCH STREQUAL x64)
 set(CLR_CMAKE_TARGET_ARCH_ARM 1)
 set(CLR_CMAKE_TARGET_ARCH_ARMV7L 1)
 set(ARM_SOFTFP 1)
 elseif(CLR_CMAKE_TARGET_ARCH STREQUAL wasm)
 set(CLR_CMAKE_TARGET_ARCH_WASM 1)
 else()
 clr_unknown_arch()
endif()
Expand DownExpand Up@@ -306,6 +312,12 @@ if(CLR_CMAKE_TARGET_OS STREQUAL SunOS)
 set(CLR_CMAKE_TARGET_SUNOS 1)
endif(CLR_CMAKE_TARGET_OS STREQUAL SunOS)

if(CLR_CMAKE_TARGET_OS STREQUAL Emscripten)
 set(CLR_CMAKE_TARGET_UNIX 1)
 set(CLR_CMAKE_TARGET_LINUX 1)
 set(CLR_CMAKE_TARGET_EMSCRIPTEN 1)
endif(CLR_CMAKE_TARGET_OS STREQUAL Emscripten)

if(CLR_CMAKE_TARGET_UNIX)
 if(CLR_CMAKE_TARGET_ARCH STREQUAL x64)
 set(CLR_CMAKE_TARGET_UNIX_AMD64 1)
Expand All@@ -317,6 +329,8 @@ if(CLR_CMAKE_TARGET_UNIX)
 set(CLR_CMAKE_TARGET_UNIX_ARM64 1)
 elseif(CLR_CMAKE_TARGET_ARCH STREQUAL x86)
 set(CLR_CMAKE_TARGET_UNIX_X86 1)
 elseif(CLR_CMAKE_TARGET_ARCH STREQUAL wasm)
 set(CLR_CMAKE_TARGET_UNIX_WASM 1)
 else()
 clr_unknown_arch()
 endif()
Expand All@@ -343,7 +357,7 @@ else()
 endif()
endif()

if(NOT CLR_CMAKE_HOST_ARCH_WASM)
if(NOT CLR_CMAKE_TARGET_EMSCRIPTEN)
 # Skip check_pie_supported call on Android as ld from llvm toolchain with NDK API level 21
 # complains about missing linker flag `-no-pie` (while level 28's ld does support this flag,
 # but since we know that PIE is supported, we can safely skip this redundant check).
Expand All@@ -363,7 +377,7 @@ if(NOT CLR_CMAKE_HOST_ARCH_WASM)
 endif(NOT CLR_CMAKE_TARGET_ANDROID)

 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
endif(NOT CLR_CMAKE_HOST_ARCH_WASM)
endif(NOT CLR_CMAKE_TARGET_EMSCRIPTEN)

string(TOLOWER "${CMAKE_BUILD_TYPE}" LOWERCASE_CMAKE_BUILD_TYPE)
if(LOWERCASE_CMAKE_BUILD_TYPE STREQUAL debug)
Expand Down

2 changes: 1 addition & 1 deletion
eng/native/configuretools.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ if (CMAKE_C_COMPILER MATCHES "-?[0-9]+(\.[0-9]+)?$")
 set(CLR_CMAKE_COMPILER_FILE_NAME_VERSION "${CMAKE_MATCH_0}")
endif()

if(NOT WIN32)
if(NOT WIN32 AND NOT CLR_CMAKE_TARGET_ARCH_WASM)
 if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 if(APPLE)
 set(TOOLSET_PREFIX "")
Expand Down

4 changes: 4 additions & 0 deletions
eng/native/gen-buildsys.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -87,6 +87,10 @@ if [[ "$scan_build" == "ON" && -n "$SCAN_BUILD_COMMAND" ]]; then
 cmake_command="$SCAN_BUILD_COMMAND $cmake_command"
fi

if [[ "$build_arch" == "wasm" ]]; then
 cmake_command="emcmake $cmake_command"
fi

# Include CMAKE_USER_MAKE_RULES_OVERRIDE as uninitialized since it will hold its value in the CMake cache otherwise can cause issues when branch switching
$cmake_command \
 -G "$generator" \
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/common/platform-matrix.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -169,7 +169,7 @@ jobs:
 archType: wasm
 platform: WebAssembly_wasm
 container:
 image: ubuntu-16.04-20200401182342-fe8b85d
 image: ubuntu-18.04-webassembly-20200409132031-f70ea41
 registry: mcr
 jobParameters:
 runtimeFlavor: ${{ parameters.runtimeFlavor }}
Expand Down

5 changes: 1 addition & 4 deletions
eng/pipelines/libraries/base-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,7 @@ jobs:
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubGroup, ''), eq(parameters.archType, 'arm')) }}:
 - _runtimeOSArg: /p:RuntimeOS=ubuntu.16.04

 # force a value for OS when cross-building WebAssembly
 - ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
 - _runtimeOSArg: -os ${{ parameters.osGroup }}

Expand DownExpand Up@@ -107,10 +108,6 @@ jobs:
 - _runtimeArtifactsPathArg: ' /p:RuntimeArtifactsPath=$(_runtimeDownloadPath)'
 - _testRunNamePrefixSuffix: $(runtimeFlavorName)_${{ parameters.liveRuntimeBuildConfig }}

 # WebAssembly uses linux implementation detail
 - ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
 - _runtimeArtifactName: 'CoreLib_Linux_x64_${{ parameters.liveRuntimeBuildConfig }}'

 # Windows variables
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 - _runtimeOSArg: /p:RuntimeOS=win10
Expand Down

24 changes: 6 additions & 18 deletions
eng/pipelines/libraries/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,21 +49,18 @@ jobs:

 ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}:
 dependsOn:
 - ${{ if ne(parameters.osGroup, 'WebAssembly') }}:
 # Use corelib dependencies for coreclr and non test builds
 - ${{ if and(eq(parameters.runtimeFlavor, 'coreclr'), eq(parameters.testScope, '')) }}:
 - ${{ format('coreclr_corelib_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}
 - ${{ if or(ne(parameters.runtimeFlavor, 'coreclr'), ne(parameters.testScope, '')) }}:
 - ${{ format('{0}_product_build_{1}{2}_{3}_{4}', parameters.runtimeFlavor, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}
 - ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
 - ${{ format('coreclr_corelib_build_{1}{2}_{3}_{4}', parameters.runtimeFlavor, 'linux', parameters.osSubgroup, 'x64', parameters.liveRuntimeBuildConfig) }}
 # Use corelib dependencies for coreclr and non test builds
 - ${{ if and(eq(parameters.runtimeFlavor, 'coreclr'), eq(parameters.testScope, '')) }}:
 - ${{ format('coreclr_corelib_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}
 - ${{ if or(ne(parameters.runtimeFlavor, 'coreclr'), ne(parameters.testScope, '')) }}:
 - ${{ format('{0}_product_build_{1}{2}_{3}_{4}', parameters.runtimeFlavor, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}

 variables:
 - _subset: libs
 - _addtionalBuildArguments: ''
 - ${{ parameters.variables }}
 - ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
 - EMSDK_PATH: $(Build.BinariesDirectory)/emsdk
 - EMSDK_PATH: /usr/local/emscripten
Comment thread
vargaz marked this conversation as resolved.

 - ${{ if eq(parameters.runTests, true) }}:
 - _subset: libs+libs.tests
 - _addtionalBuildArguments: /p:ArchiveTests=true
Expand All@@ -80,15 +77,6 @@ jobs:
 ln -s /usr/local/opt/openssl/lib/pkgconfig/openssl.pc /usr/local/lib/pkgconfig/
 displayName: Install Build Dependencies

 - ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
 - script: |
 EMSCRIPTEN_VERSION=1.38.47
 git clone https://github.com/emscripten-core/emsdk.git $(EMSDK_PATH)
 cd $(EMSDK_PATH)
 ./emsdk install ${EMSCRIPTEN_VERSION}-upstream
 ./emsdk activate --embedded ${EMSCRIPTEN_VERSION}-upstream
 displayName: Install Emscripten

 - ${{ if eq(parameters.isOfficialBuild, true) }}:
 - template: /eng/pipelines/common/restore-internal-tools.yml
 parameters:
Expand Down

7 changes: 7 additions & 0 deletions
eng/pipelines/mono/templates/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,13 @@ jobs:
 - ${{ if eq(parameters.osGroup, 'Android') }}:
 - name: osOverride
 value: -os Android
 - ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
 - name: EMSDK_PATH
 value: /usr/local/emscripten
 - name: archType
 value: wasm
 - name: osOverride
 value: '-os WebAssembly'
 - ${{ parameters.variables }}

 steps:
Expand Down

5 changes: 4 additions & 1 deletion
eng/pipelines/runtime.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -266,6 +266,7 @@ jobs:
 - Linux_arm
 - Linux_arm64
 - Linux_musl_x64
 - WebAssembly_wasm
 # - Linux_musl_arm64
 - Windows_NT_x64
 # - Windows_NT_x86
Expand DownExpand Up@@ -302,6 +303,7 @@ jobs:
 - Linux_arm
 - Linux_arm64
 - Linux_musl_x64
 - WebAssembly_wasm
 # - Linux_musl_arm64
 - Windows_NT_x64
 # - Windows_NT_x86
Expand DownExpand Up@@ -420,6 +422,7 @@ jobs:
 # - iOS_arm # https://github.com/dotnet/runtime/issues/34465
 - iOS_arm64
 - iOS_x64
 - WebAssembly_wasm
 jobParameters:
 liveRuntimeBuildConfig: release

Expand All@@ -438,6 +441,7 @@ jobs:
 # - iOS_arm # https://github.com/dotnet/runtime/issues/34465
 - iOS_arm64
 - iOS_x64
 - WebAssembly_wasm
 jobParameters:
 liveRuntimeBuildConfig: debug

Expand All@@ -449,7 +453,6 @@ jobs:
 jobTemplate: /eng/pipelines/libraries/build-job.yml
 buildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
 platforms:
 - WebAssembly_wasm
 - ${{ if eq(variables['isFullMatrix'], false) }}:
 - Windows_NT_x86
 jobParameters:
Expand Down

3 changes: 3 additions & 0 deletions
src/libraries/Native/Unix/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,9 @@ elseif (CLR_CMAKE_TARGET_ARCH_I386)
 add_definitions(-DTARGET_32BIT=1)
 add_definitions(-DTARGET_X86)
 add_definitions(-D_FILE_OFFSET_BITS=64)
elseif (CLR_CMAKE_TARGET_ARCH_WASM)
 add_definitions(-DTARGET_32BIT=1)
 add_definitions(-DTARGET_WASM)
elseif (CLR_CMAKE_TARGET_ARCH_ARM64)
 add_definitions(-DTARGET_64BIT=1)
 add_definitions(-DTARGET_ARM64)
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/Native/Unix/System.IO.Compression.Native/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
project(System.IO.Compression.Native C)

if (CLR_CMAKE_TARGET_WASM)
if (CLR_CMAKE_TARGET_ARCH_WASM)
 add_definitions(-s USE_ZLIB)
elseif (CLR_CMAKE_TARGET_ANDROID)
 # need special case here since we want to link against libz.so but find_package() would resolve libz.a
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/Native/Unix/System.Native/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ else ()
 set(NATIVE_SOURCES ${NATIVE_SOURCES} pal_console.c)
endif ()

if (CLR_CMAKE_TARGET_LINUX)
if (CLR_CMAKE_TARGET_LINUX AND NOT CLR_CMAKE_TARGET_ARCH_WASM)
 set(NATIVE_SOURCES ${NATIVE_SOURCES} pal_networkchange.c)

 if (!HAVE_LINUX_RTNETLINK_H)
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/Native/Unix/System.Native/pal_runtimeinformation.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ int32_t SystemNative_GetOSArchitecture()
 return ARCH_ARM64;
#elif defined(TARGET_AMD64)
 return ARCH_X64;
#elif defined(TARGET_X86)
#elif defined(TARGET_X86) || defined(TARGET_WASM) // TODO: add arch for WASM
 return ARCH_X86;
#else
#error Unidentified Architecture
Expand All@@ -71,7 +71,7 @@ int32_t SystemNative_GetProcessArchitecture()
 return ARCH_ARM64;
#elif defined(TARGET_AMD64)
 return ARCH_X64;
#elif defined(TARGET_X86)
#elif defined(TARGET_X86) || defined(TARGET_WASM) // TODO: add arch for WASM
 return ARCH_X86;
#else
#error Unidentified Architecture
Expand Down

6 changes: 3 additions & 3 deletions
src/libraries/Native/Unix/configure.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,8 @@ include(CheckTypeSize)

if (CLR_CMAKE_TARGET_ANDROID)
 set(PAL_UNIX_NAME \"ANDROID\")
elseif (CLR_CMAKE_TARGET_ARCH_WASM)
 set(PAL_UNIX_NAME \"WEBASSEMBLY\")
elseif (CLR_CMAKE_TARGET_LINUX)
 set(PAL_UNIX_NAME \"LINUX\")
elseif (CLR_CMAKE_TARGET_OSX)
Expand All@@ -28,8 +30,6 @@ elseif (CLR_CMAKE_TARGET_FREEBSD)
 set(CMAKE_REQUIRED_INCLUDES ${CROSS_ROOTFS}/usr/local/include)
elseif (CLR_CMAKE_TARGET_NETBSD)
 set(PAL_UNIX_NAME \"NETBSD\")
elseif (CLR_CMAKE_TARGET_ARCH_WASM)
 set(PAL_UNIX_NAME \"WEBASSEMBLY\")
else ()
 message(FATAL_ERROR "Unknown platform. Cannot define PAL_UNIX_NAME, used by RuntimeInformation.")
endif ()
Expand DownExpand Up@@ -839,7 +839,7 @@ set (CMAKE_REQUIRED_LIBRARIES ${PREVIOUS_CMAKE_REQUIRED_LIBRARIES})
set (HAVE_INOTIFY 0)
if (HAVE_INOTIFY_INIT AND HAVE_INOTIFY_ADD_WATCH AND HAVE_INOTIFY_RM_WATCH)
 set (HAVE_INOTIFY 1)
elseif (CLR_CMAKE_TARGET_LINUX)
elseif (CLR_CMAKE_TARGET_LINUX AND NOT CLR_CMAKE_TARGET_ARCH_WASM)
 message(FATAL_ERROR "Cannot find inotify functions on a Linux platform.")
endif()

Expand Down

5 changes: 4 additions & 1 deletion
src/libraries/Native/build-native.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,10 +49,13 @@ source "$__RepoRootDir"/eng/native/build-commons.sh

if [[ "$__BuildArch" == wasm ]]; then
 if [[ -z "$EMSDK_PATH" ]]; then
 echo "Error: Should set EMSDK_PATH environment variable pointing to emsdk root."
 echo "Error: You need to set the EMSDK_PATH environment variable pointing to the emscripten SDK root."
 exit 1
 fi
 source "$EMSDK_PATH"/emsdk_env.sh

 export CLR_CC=$(which emcc)
 export CLR_CXX=$(which em++)

Comment on lines

+57
 to 
+58

@am11am11Apr 13, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A nit, typically posix-y command -v is preferred over which in this repo. (same goes for which false below)
@akoeplingerakoeplingerApr 14, 2020•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@am11 I tried that but it didn't work since we expect the full path in CLR_CC and command -v doesn't do that (for false at least)
elif [[ "$__TargetOS" == iOS ]]; then
 # nothing to do here
 true
Expand Down

3 changes: 2 additions & 1 deletion
src/mono/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,8 +42,9 @@
 <TargetsiOSSimulator Condition="'$(TargetsiOS)' == 'true' and '$(Platform)' == 'x64'">true</TargetsiOSSimulator>
 <TargetstvOSSimulator Condition="'$(TargetstvOS)' == 'true' and '$(Platform)' == 'x64'">true</TargetstvOSSimulator>
 <TargetsAndroid Condition="'$(TargetOS)' == 'Android'">true</TargetsAndroid>
 <TargetsWASM Condition="'$(TargetOS)' == 'WebAssembly'">true</TargetsWASM>
 <TargetsWindows Condition="'$(TargetOS)' == 'Windows_NT'">true</TargetsWindows>
 <TargetsUnix Condition="'$(TargetsFreeBSD)' == 'true' or '$(TargetsLinux)' == 'true' or '$(TargetsNetBSD)' == 'true' or '$(TargetsOSX)' == 'true' or '$(TargetstvOS)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetsAndroid)' == 'true'">true</TargetsUnix>
 <TargetsUnix Condition="'$(TargetsFreeBSD)' == 'true' or '$(TargetsLinux)' == 'true' or '$(TargetsNetBSD)' == 'true' or '$(TargetsOSX)' == 'true' or '$(TargetstvOS)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetsAndroid)' == 'true' or '$(TargetsWASM)' == 'true'">true</TargetsUnix>
 </PropertyGroup>

 <PropertyGroup>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Add beginnings of WebAssembly build support for mono.#33551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

akoeplinger
merged 10 commits into

from

Apr 10, 2020
 Merged


Add beginnings of WebAssembly build support for mono.
#33551
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
7703390

Add beginnings of WebAssembly build support for mono.


vargaz Apr 3, 2020
b803077

Add beginnings of WebAssembly build support for mono.


vargaz Apr 3, 2020
5638e2b

Merge branch 'master' into wasm-build


akoeplinger Apr 7, 2020
03bd7da

Set emcc as the compiler for libraries build


akoeplinger Apr 7, 2020
9712249

Add default subsets for webassembly build


akoeplinger Apr 7, 2020
73d2a7c

Use WebAssembly Docker image


akoeplinger Apr 7, 2020
9e130dc

Fix various problems in the build


akoeplinger Apr 7, 2020
74819de

Merge remote-tracking branch 'upstream/master' into wasm-build


akoeplinger Apr 9, 2020
1da9cc8

Bump webassembly image


akoeplinger Apr 9, 2020
a4b955f

Use Mono runtime for webassembly builds


akoeplinger Apr 9, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
eng/Subsets.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@
 <PropertyGroup>
 <DefaultSubsets>clr+mono+libs+installer</DefaultSubsets>
 <DefaultSubsets Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'Android' or '$(TargetOS)' == 'tvOS'">mono+libs+installer</DefaultSubsets>
 <DefaultSubsetCategories Condition="'$(TargetOS)' == 'WebAssembly'">mono+libs</DefaultSubsetCategories>
 </PropertyGroup>

 <PropertyGroup>
Expand DownExpand Up@@ -66,7 +67,7 @@
 </PropertyGroup>

 <PropertyGroup>
 <RuntimeFlavor Condition="'$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'Android'">Mono</RuntimeFlavor>
 <RuntimeFlavor Condition="'$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'Android' or '$(TargetOS)' == 'WebAssembly'">Mono</RuntimeFlavor>
 <RuntimeFlavor Condition="'$(RuntimeFlavor)' == '' and $(_subset.Contains('+mono.runtime+')) and !$(_subset.Contains('+clr.runtime+'))">Mono</RuntimeFlavor>
 <RuntimeFlavor Condition="'$(RuntimeFlavor)' == ''">CoreCLR</RuntimeFlavor>
 </PropertyGroup>
Expand Down

9 changes: 7 additions & 2 deletions
eng/native/build-commons.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -151,8 +151,13 @@ build_native()

 popd
 else
 echo "Executing cmake --build \"$intermediatesDir\" --target install -j $__NumProc"
 cmake --build "$intermediatesDir" --target install -j "$__NumProc"
 cmake_command=cmake
 if [[ "$build_arch" == "wasm" ]]; then
 cmake_command="emcmake $cmake_command"
 fi

 echo "Executing $cmake_command --build \"$intermediatesDir\" --target install -j $__NumProc"
 $cmake_command --build "$intermediatesDir" --target install -j "$__NumProc"
 fi

 local exit_code="$?"
Expand Down

20 changes: 17 additions & 3 deletions
eng/native/configureplatform.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -166,7 +166,8 @@ if(CLR_CMAKE_HOST_OS STREQUAL Windows)
endif(CLR_CMAKE_HOST_OS STREQUAL Windows)

if(CLR_CMAKE_HOST_OS STREQUAL Emscripten)
 set(CLR_CMAKE_HOST_ARCH_WASM 1)
 #set(CLR_CMAKE_HOST_UNIX 1) # TODO: this should be reenabled but it activates a bunch of additional compiler flags in configurecompiler.cmake
 set(CLR_CMAKE_HOST_UNIX_WASM 1)
endif(CLR_CMAKE_HOST_OS STREQUAL Emscripten)

#--------------------------------------------
Expand DownExpand Up@@ -196,6 +197,9 @@ elseif(CLR_CMAKE_HOST_UNIX_AMD64)
elseif(CLR_CMAKE_HOST_UNIX_X86)
 set(CLR_CMAKE_HOST_ARCH_I386 1)
 set(CLR_CMAKE_HOST_ARCH "x86")
elseif(CLR_CMAKE_HOST_UNIX_WASM)
 set(CLR_CMAKE_HOST_ARCH_WASM 1)
 set(CLR_CMAKE_HOST_ARCH "wasm")
elseif(WIN32)
 # CLR_CMAKE_HOST_ARCH is passed in as param to cmake
 if (CLR_CMAKE_HOST_ARCH STREQUAL x64)
Expand DownExpand Up@@ -237,6 +241,8 @@ if (CLR_CMAKE_TARGET_ARCH STREQUAL x64)
 set(CLR_CMAKE_TARGET_ARCH_ARM 1)
 set(CLR_CMAKE_TARGET_ARCH_ARMV7L 1)
 set(ARM_SOFTFP 1)
 elseif(CLR_CMAKE_TARGET_ARCH STREQUAL wasm)
 set(CLR_CMAKE_TARGET_ARCH_WASM 1)
 else()
 clr_unknown_arch()
endif()
Expand DownExpand Up@@ -306,6 +312,12 @@ if(CLR_CMAKE_TARGET_OS STREQUAL SunOS)
 set(CLR_CMAKE_TARGET_SUNOS 1)
endif(CLR_CMAKE_TARGET_OS STREQUAL SunOS)

if(CLR_CMAKE_TARGET_OS STREQUAL Emscripten)
 set(CLR_CMAKE_TARGET_UNIX 1)
 set(CLR_CMAKE_TARGET_LINUX 1)
 set(CLR_CMAKE_TARGET_EMSCRIPTEN 1)
endif(CLR_CMAKE_TARGET_OS STREQUAL Emscripten)

if(CLR_CMAKE_TARGET_UNIX)
 if(CLR_CMAKE_TARGET_ARCH STREQUAL x64)
 set(CLR_CMAKE_TARGET_UNIX_AMD64 1)
Expand All@@ -317,6 +329,8 @@ if(CLR_CMAKE_TARGET_UNIX)
 set(CLR_CMAKE_TARGET_UNIX_ARM64 1)
 elseif(CLR_CMAKE_TARGET_ARCH STREQUAL x86)
 set(CLR_CMAKE_TARGET_UNIX_X86 1)
 elseif(CLR_CMAKE_TARGET_ARCH STREQUAL wasm)
 set(CLR_CMAKE_TARGET_UNIX_WASM 1)
 else()
 clr_unknown_arch()
 endif()
Expand All@@ -343,7 +357,7 @@ else()
 endif()
endif()

if(NOT CLR_CMAKE_HOST_ARCH_WASM)
if(NOT CLR_CMAKE_TARGET_EMSCRIPTEN)
 # Skip check_pie_supported call on Android as ld from llvm toolchain with NDK API level 21
 # complains about missing linker flag `-no-pie` (while level 28's ld does support this flag,
 # but since we know that PIE is supported, we can safely skip this redundant check).
Expand All@@ -363,7 +377,7 @@ if(NOT CLR_CMAKE_HOST_ARCH_WASM)
 endif(NOT CLR_CMAKE_TARGET_ANDROID)

 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
endif(NOT CLR_CMAKE_HOST_ARCH_WASM)
endif(NOT CLR_CMAKE_TARGET_EMSCRIPTEN)

string(TOLOWER "${CMAKE_BUILD_TYPE}" LOWERCASE_CMAKE_BUILD_TYPE)
if(LOWERCASE_CMAKE_BUILD_TYPE STREQUAL debug)
Expand Down

2 changes: 1 addition & 1 deletion
eng/native/configuretools.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ if (CMAKE_C_COMPILER MATCHES "-?[0-9]+(\.[0-9]+)?$")
 set(CLR_CMAKE_COMPILER_FILE_NAME_VERSION "${CMAKE_MATCH_0}")
endif()

if(NOT WIN32)
if(NOT WIN32 AND NOT CLR_CMAKE_TARGET_ARCH_WASM)
 if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 if(APPLE)
 set(TOOLSET_PREFIX "")
Expand Down

4 changes: 4 additions & 0 deletions
eng/native/gen-buildsys.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -87,6 +87,10 @@ if [[ "$scan_build" == "ON" && -n "$SCAN_BUILD_COMMAND" ]]; then
 cmake_command="$SCAN_BUILD_COMMAND $cmake_command"
fi

if [[ "$build_arch" == "wasm" ]]; then
 cmake_command="emcmake $cmake_command"
fi

# Include CMAKE_USER_MAKE_RULES_OVERRIDE as uninitialized since it will hold its value in the CMake cache otherwise can cause issues when branch switching
$cmake_command \
 -G "$generator" \
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/common/platform-matrix.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -169,7 +169,7 @@ jobs:
 archType: wasm
 platform: WebAssembly_wasm
 container:
 image: ubuntu-16.04-20200401182342-fe8b85d
 image: ubuntu-18.04-webassembly-20200409132031-f70ea41
 registry: mcr
 jobParameters:
 runtimeFlavor: ${{ parameters.runtimeFlavor }}
Expand Down

5 changes: 1 addition & 4 deletions
eng/pipelines/libraries/base-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,7 @@ jobs:
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubGroup, ''), eq(parameters.archType, 'arm')) }}:
 - _runtimeOSArg: /p:RuntimeOS=ubuntu.16.04

 # force a value for OS when cross-building WebAssembly
 - ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
 - _runtimeOSArg: -os ${{ parameters.osGroup }}

Expand DownExpand Up@@ -107,10 +108,6 @@ jobs:
 - _runtimeArtifactsPathArg: ' /p:RuntimeArtifactsPath=$(_runtimeDownloadPath)'
 - _testRunNamePrefixSuffix: $(runtimeFlavorName)_${{ parameters.liveRuntimeBuildConfig }}

 # WebAssembly uses linux implementation detail
 - ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
 - _runtimeArtifactName: 'CoreLib_Linux_x64_${{ parameters.liveRuntimeBuildConfig }}'

 # Windows variables
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 - _runtimeOSArg: /p:RuntimeOS=win10
Expand Down

24 changes: 6 additions & 18 deletions
eng/pipelines/libraries/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,21 +49,18 @@ jobs:

 ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}:
 dependsOn:
 - ${{ if ne(parameters.osGroup, 'WebAssembly') }}:
 # Use corelib dependencies for coreclr and non test builds
 - ${{ if and(eq(parameters.runtimeFlavor, 'coreclr'), eq(parameters.testScope, '')) }}:
 - ${{ format('coreclr_corelib_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}
 - ${{ if or(ne(parameters.runtimeFlavor, 'coreclr'), ne(parameters.testScope, '')) }}:
 - ${{ format('{0}_product_build_{1}{2}_{3}_{4}', parameters.runtimeFlavor, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}
 - ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
 - ${{ format('coreclr_corelib_build_{1}{2}_{3}_{4}', parameters.runtimeFlavor, 'linux', parameters.osSubgroup, 'x64', parameters.liveRuntimeBuildConfig) }}
 # Use corelib dependencies for coreclr and non test builds
 - ${{ if and(eq(parameters.runtimeFlavor, 'coreclr'), eq(parameters.testScope, '')) }}:
 - ${{ format('coreclr_corelib_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}
 - ${{ if or(ne(parameters.runtimeFlavor, 'coreclr'), ne(parameters.testScope, '')) }}:
 - ${{ format('{0}_product_build_{1}{2}_{3}_{4}', parameters.runtimeFlavor, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}

 variables:
 - _subset: libs
 - _addtionalBuildArguments: ''
 - ${{ parameters.variables }}
 - ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
 - EMSDK_PATH: $(Build.BinariesDirectory)/emsdk
 - EMSDK_PATH: /usr/local/emscripten
Comment thread
vargaz marked this conversation as resolved.

 - ${{ if eq(parameters.runTests, true) }}:
 - _subset: libs+libs.tests
 - _addtionalBuildArguments: /p:ArchiveTests=true
Expand All@@ -80,15 +77,6 @@ jobs:
 ln -s /usr/local/opt/openssl/lib/pkgconfig/openssl.pc /usr/local/lib/pkgconfig/
 displayName: Install Build Dependencies

 - ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
 - script: |
 EMSCRIPTEN_VERSION=1.38.47
 git clone https://github.com/emscripten-core/emsdk.git $(EMSDK_PATH)
 cd $(EMSDK_PATH)
 ./emsdk install ${EMSCRIPTEN_VERSION}-upstream
 ./emsdk activate --embedded ${EMSCRIPTEN_VERSION}-upstream
 displayName: Install Emscripten

 - ${{ if eq(parameters.isOfficialBuild, true) }}:
 - template: /eng/pipelines/common/restore-internal-tools.yml
 parameters:
Expand Down

7 changes: 7 additions & 0 deletions
eng/pipelines/mono/templates/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,13 @@ jobs:
 - ${{ if eq(parameters.osGroup, 'Android') }}:
 - name: osOverride
 value: -os Android
 - ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
 - name: EMSDK_PATH
 value: /usr/local/emscripten
 - name: archType
 value: wasm
 - name: osOverride
 value: '-os WebAssembly'
 - ${{ parameters.variables }}

 steps:
Expand Down

5 changes: 4 additions & 1 deletion
eng/pipelines/runtime.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -266,6 +266,7 @@ jobs:
 - Linux_arm
 - Linux_arm64
 - Linux_musl_x64
 - WebAssembly_wasm
 # - Linux_musl_arm64
 - Windows_NT_x64
 # - Windows_NT_x86
Expand DownExpand Up@@ -302,6 +303,7 @@ jobs:
 - Linux_arm
 - Linux_arm64
 - Linux_musl_x64
 - WebAssembly_wasm
 # - Linux_musl_arm64
 - Windows_NT_x64
 # - Windows_NT_x86
Expand DownExpand Up@@ -420,6 +422,7 @@ jobs:
 # - iOS_arm # https://github.com/dotnet/runtime/issues/34465
 - iOS_arm64
 - iOS_x64
 - WebAssembly_wasm
 jobParameters:
 liveRuntimeBuildConfig: release

Expand All@@ -438,6 +441,7 @@ jobs:
 # - iOS_arm # https://github.com/dotnet/runtime/issues/34465
 - iOS_arm64
 - iOS_x64
 - WebAssembly_wasm
 jobParameters:
 liveRuntimeBuildConfig: debug

Expand All@@ -449,7 +453,6 @@ jobs:
 jobTemplate: /eng/pipelines/libraries/build-job.yml
 buildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
 platforms:
 - WebAssembly_wasm
 - ${{ if eq(variables['isFullMatrix'], false) }}:
 - Windows_NT_x86
 jobParameters:
Expand Down

3 changes: 3 additions & 0 deletions
src/libraries/Native/Unix/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,9 @@ elseif (CLR_CMAKE_TARGET_ARCH_I386)
 add_definitions(-DTARGET_32BIT=1)
 add_definitions(-DTARGET_X86)
 add_definitions(-D_FILE_OFFSET_BITS=64)
elseif (CLR_CMAKE_TARGET_ARCH_WASM)
 add_definitions(-DTARGET_32BIT=1)
 add_definitions(-DTARGET_WASM)
elseif (CLR_CMAKE_TARGET_ARCH_ARM64)
 add_definitions(-DTARGET_64BIT=1)
 add_definitions(-DTARGET_ARM64)
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/Native/Unix/System.IO.Compression.Native/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
project(System.IO.Compression.Native C)

if (CLR_CMAKE_TARGET_WASM)
if (CLR_CMAKE_TARGET_ARCH_WASM)
 add_definitions(-s USE_ZLIB)
elseif (CLR_CMAKE_TARGET_ANDROID)
 # need special case here since we want to link against libz.so but find_package() would resolve libz.a
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/Native/Unix/System.Native/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ else ()
 set(NATIVE_SOURCES ${NATIVE_SOURCES} pal_console.c)
endif ()

if (CLR_CMAKE_TARGET_LINUX)
if (CLR_CMAKE_TARGET_LINUX AND NOT CLR_CMAKE_TARGET_ARCH_WASM)
 set(NATIVE_SOURCES ${NATIVE_SOURCES} pal_networkchange.c)

 if (!HAVE_LINUX_RTNETLINK_H)
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/Native/Unix/System.Native/pal_runtimeinformation.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ int32_t SystemNative_GetOSArchitecture()
 return ARCH_ARM64;
#elif defined(TARGET_AMD64)
 return ARCH_X64;
#elif defined(TARGET_X86)
#elif defined(TARGET_X86) || defined(TARGET_WASM) // TODO: add arch for WASM
 return ARCH_X86;
#else
#error Unidentified Architecture
Expand All@@ -71,7 +71,7 @@ int32_t SystemNative_GetProcessArchitecture()
 return ARCH_ARM64;
#elif defined(TARGET_AMD64)
 return ARCH_X64;
#elif defined(TARGET_X86)
#elif defined(TARGET_X86) || defined(TARGET_WASM) // TODO: add arch for WASM
 return ARCH_X86;
#else
#error Unidentified Architecture
Expand Down

6 changes: 3 additions & 3 deletions
src/libraries/Native/Unix/configure.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,8 @@ include(CheckTypeSize)

if (CLR_CMAKE_TARGET_ANDROID)
 set(PAL_UNIX_NAME \"ANDROID\")
elseif (CLR_CMAKE_TARGET_ARCH_WASM)
 set(PAL_UNIX_NAME \"WEBASSEMBLY\")
elseif (CLR_CMAKE_TARGET_LINUX)
 set(PAL_UNIX_NAME \"LINUX\")
elseif (CLR_CMAKE_TARGET_OSX)
Expand All@@ -28,8 +30,6 @@ elseif (CLR_CMAKE_TARGET_FREEBSD)
 set(CMAKE_REQUIRED_INCLUDES ${CROSS_ROOTFS}/usr/local/include)
elseif (CLR_CMAKE_TARGET_NETBSD)
 set(PAL_UNIX_NAME \"NETBSD\")
elseif (CLR_CMAKE_TARGET_ARCH_WASM)
 set(PAL_UNIX_NAME \"WEBASSEMBLY\")
else ()
 message(FATAL_ERROR "Unknown platform. Cannot define PAL_UNIX_NAME, used by RuntimeInformation.")
endif ()
Expand DownExpand Up@@ -839,7 +839,7 @@ set (CMAKE_REQUIRED_LIBRARIES ${PREVIOUS_CMAKE_REQUIRED_LIBRARIES})
set (HAVE_INOTIFY 0)
if (HAVE_INOTIFY_INIT AND HAVE_INOTIFY_ADD_WATCH AND HAVE_INOTIFY_RM_WATCH)
 set (HAVE_INOTIFY 1)
elseif (CLR_CMAKE_TARGET_LINUX)
elseif (CLR_CMAKE_TARGET_LINUX AND NOT CLR_CMAKE_TARGET_ARCH_WASM)
 message(FATAL_ERROR "Cannot find inotify functions on a Linux platform.")
endif()

Expand Down

5 changes: 4 additions & 1 deletion
src/libraries/Native/build-native.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,10 +49,13 @@ source "$__RepoRootDir"/eng/native/build-commons.sh

if [[ "$__BuildArch" == wasm ]]; then
 if [[ -z "$EMSDK_PATH" ]]; then
 echo "Error: Should set EMSDK_PATH environment variable pointing to emsdk root."
 echo "Error: You need to set the EMSDK_PATH environment variable pointing to the emscripten SDK root."
 exit 1
 fi
 source "$EMSDK_PATH"/emsdk_env.sh

 export CLR_CC=$(which emcc)
 export CLR_CXX=$(which em++)

Comment on lines

+57
 to 
+58

@am11am11Apr 13, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A nit, typically posix-y command -v is preferred over which in this repo. (same goes for which false below)
@akoeplingerakoeplingerApr 14, 2020•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@am11 I tried that but it didn't work since we expect the full path in CLR_CC and command -v doesn't do that (for false at least)
elif [[ "$__TargetOS" == iOS ]]; then
 # nothing to do here
 true
Expand Down

3 changes: 2 additions & 1 deletion
src/mono/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,8 +42,9 @@
 <TargetsiOSSimulator Condition="'$(TargetsiOS)' == 'true' and '$(Platform)' == 'x64'">true</TargetsiOSSimulator>
 <TargetstvOSSimulator Condition="'$(TargetstvOS)' == 'true' and '$(Platform)' == 'x64'">true</TargetstvOSSimulator>
 <TargetsAndroid Condition="'$(TargetOS)' == 'Android'">true</TargetsAndroid>
 <TargetsWASM Condition="'$(TargetOS)' == 'WebAssembly'">true</TargetsWASM>
 <TargetsWindows Condition="'$(TargetOS)' == 'Windows_NT'">true</TargetsWindows>
 <TargetsUnix Condition="'$(TargetsFreeBSD)' == 'true' or '$(TargetsLinux)' == 'true' or '$(TargetsNetBSD)' == 'true' or '$(TargetsOSX)' == 'true' or '$(TargetstvOS)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetsAndroid)' == 'true'">true</TargetsUnix>
 <TargetsUnix Condition="'$(TargetsFreeBSD)' == 'true' or '$(TargetsLinux)' == 'true' or '$(TargetsNetBSD)' == 'true' or '$(TargetsOSX)' == 'true' or '$(TargetstvOS)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetsAndroid)' == 'true' or '$(TargetsWASM)' == 'true'">true</TargetsUnix>
 </PropertyGroup>

 <PropertyGroup>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add beginnings of WebAssembly build support for mono.#33551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

akoeplinger
merged 10 commits into

from

Apr 10, 2020
 Merged


Add beginnings of WebAssembly build support for mono.
#33551
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
7703390

Add beginnings of WebAssembly build support for mono.


vargaz Apr 3, 2020
b803077

Add beginnings of WebAssembly build support for mono.


vargaz Apr 3, 2020
5638e2b

Merge branch 'master' into wasm-build


akoeplinger Apr 7, 2020
03bd7da

Set emcc as the compiler for libraries build


akoeplinger Apr 7, 2020
9712249

Add default subsets for webassembly build


akoeplinger Apr 7, 2020
73d2a7c

Use WebAssembly Docker image


akoeplinger Apr 7, 2020
9e130dc

Fix various problems in the build


akoeplinger Apr 7, 2020
74819de

Merge remote-tracking branch 'upstream/master' into wasm-build


akoeplinger Apr 9, 2020
1da9cc8

Bump webassembly image


akoeplinger Apr 9, 2020
a4b955f

Use Mono runtime for webassembly builds


akoeplinger Apr 9, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
eng/Subsets.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@
 <PropertyGroup>
 <DefaultSubsets>clr+mono+libs+installer</DefaultSubsets>
 <DefaultSubsets Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'Android' or '$(TargetOS)' == 'tvOS'">mono+libs+installer</DefaultSubsets>
 <DefaultSubsetCategories Condition="'$(TargetOS)' == 'WebAssembly'">mono+libs</DefaultSubsetCategories>
 </PropertyGroup>

 <PropertyGroup>
Expand DownExpand Up@@ -66,7 +67,7 @@
 </PropertyGroup>

 <PropertyGroup>
 <RuntimeFlavor Condition="'$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'Android'">Mono</RuntimeFlavor>
 <RuntimeFlavor Condition="'$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'Android' or '$(TargetOS)' == 'WebAssembly'">Mono</RuntimeFlavor>
 <RuntimeFlavor Condition="'$(RuntimeFlavor)' == '' and $(_subset.Contains('+mono.runtime+')) and !$(_subset.Contains('+clr.runtime+'))">Mono</RuntimeFlavor>
 <RuntimeFlavor Condition="'$(RuntimeFlavor)' == ''">CoreCLR</RuntimeFlavor>
 </PropertyGroup>
Expand Down

9 changes: 7 additions & 2 deletions
eng/native/build-commons.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -151,8 +151,13 @@ build_native()

 popd
 else
 echo "Executing cmake --build \"$intermediatesDir\" --target install -j $__NumProc"
 cmake --build "$intermediatesDir" --target install -j "$__NumProc"
 cmake_command=cmake
 if [[ "$build_arch" == "wasm" ]]; then
 cmake_command="emcmake $cmake_command"
 fi

 echo "Executing $cmake_command --build \"$intermediatesDir\" --target install -j $__NumProc"
 $cmake_command --build "$intermediatesDir" --target install -j "$__NumProc"
 fi

 local exit_code="$?"
Expand Down

20 changes: 17 additions & 3 deletions
eng/native/configureplatform.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -166,7 +166,8 @@ if(CLR_CMAKE_HOST_OS STREQUAL Windows)
endif(CLR_CMAKE_HOST_OS STREQUAL Windows)

if(CLR_CMAKE_HOST_OS STREQUAL Emscripten)
 set(CLR_CMAKE_HOST_ARCH_WASM 1)
 #set(CLR_CMAKE_HOST_UNIX 1) # TODO: this should be reenabled but it activates a bunch of additional compiler flags in configurecompiler.cmake
 set(CLR_CMAKE_HOST_UNIX_WASM 1)
endif(CLR_CMAKE_HOST_OS STREQUAL Emscripten)

#--------------------------------------------
Expand DownExpand Up@@ -196,6 +197,9 @@ elseif(CLR_CMAKE_HOST_UNIX_AMD64)
elseif(CLR_CMAKE_HOST_UNIX_X86)
 set(CLR_CMAKE_HOST_ARCH_I386 1)
 set(CLR_CMAKE_HOST_ARCH "x86")
elseif(CLR_CMAKE_HOST_UNIX_WASM)
 set(CLR_CMAKE_HOST_ARCH_WASM 1)
 set(CLR_CMAKE_HOST_ARCH "wasm")
elseif(WIN32)
 # CLR_CMAKE_HOST_ARCH is passed in as param to cmake
 if (CLR_CMAKE_HOST_ARCH STREQUAL x64)
Expand DownExpand Up@@ -237,6 +241,8 @@ if (CLR_CMAKE_TARGET_ARCH STREQUAL x64)
 set(CLR_CMAKE_TARGET_ARCH_ARM 1)
 set(CLR_CMAKE_TARGET_ARCH_ARMV7L 1)
 set(ARM_SOFTFP 1)
 elseif(CLR_CMAKE_TARGET_ARCH STREQUAL wasm)
 set(CLR_CMAKE_TARGET_ARCH_WASM 1)
 else()
 clr_unknown_arch()
endif()
Expand DownExpand Up@@ -306,6 +312,12 @@ if(CLR_CMAKE_TARGET_OS STREQUAL SunOS)
 set(CLR_CMAKE_TARGET_SUNOS 1)
endif(CLR_CMAKE_TARGET_OS STREQUAL SunOS)

if(CLR_CMAKE_TARGET_OS STREQUAL Emscripten)
 set(CLR_CMAKE_TARGET_UNIX 1)
 set(CLR_CMAKE_TARGET_LINUX 1)
 set(CLR_CMAKE_TARGET_EMSCRIPTEN 1)
endif(CLR_CMAKE_TARGET_OS STREQUAL Emscripten)

if(CLR_CMAKE_TARGET_UNIX)
 if(CLR_CMAKE_TARGET_ARCH STREQUAL x64)
 set(CLR_CMAKE_TARGET_UNIX_AMD64 1)
Expand All@@ -317,6 +329,8 @@ if(CLR_CMAKE_TARGET_UNIX)
 set(CLR_CMAKE_TARGET_UNIX_ARM64 1)
 elseif(CLR_CMAKE_TARGET_ARCH STREQUAL x86)
 set(CLR_CMAKE_TARGET_UNIX_X86 1)
 elseif(CLR_CMAKE_TARGET_ARCH STREQUAL wasm)
 set(CLR_CMAKE_TARGET_UNIX_WASM 1)
 else()
 clr_unknown_arch()
 endif()
Expand All@@ -343,7 +357,7 @@ else()
 endif()
endif()

if(NOT CLR_CMAKE_HOST_ARCH_WASM)
if(NOT CLR_CMAKE_TARGET_EMSCRIPTEN)
 # Skip check_pie_supported call on Android as ld from llvm toolchain with NDK API level 21
 # complains about missing linker flag `-no-pie` (while level 28's ld does support this flag,
 # but since we know that PIE is supported, we can safely skip this redundant check).
Expand All@@ -363,7 +377,7 @@ if(NOT CLR_CMAKE_HOST_ARCH_WASM)
 endif(NOT CLR_CMAKE_TARGET_ANDROID)

 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
endif(NOT CLR_CMAKE_HOST_ARCH_WASM)
endif(NOT CLR_CMAKE_TARGET_EMSCRIPTEN)

string(TOLOWER "${CMAKE_BUILD_TYPE}" LOWERCASE_CMAKE_BUILD_TYPE)
if(LOWERCASE_CMAKE_BUILD_TYPE STREQUAL debug)
Expand Down

2 changes: 1 addition & 1 deletion
eng/native/configuretools.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ if (CMAKE_C_COMPILER MATCHES "-?[0-9]+(\.[0-9]+)?$")
 set(CLR_CMAKE_COMPILER_FILE_NAME_VERSION "${CMAKE_MATCH_0}")
endif()

if(NOT WIN32)
if(NOT WIN32 AND NOT CLR_CMAKE_TARGET_ARCH_WASM)
 if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 if(APPLE)
 set(TOOLSET_PREFIX "")
Expand Down

4 changes: 4 additions & 0 deletions
eng/native/gen-buildsys.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -87,6 +87,10 @@ if [[ "$scan_build" == "ON" && -n "$SCAN_BUILD_COMMAND" ]]; then
 cmake_command="$SCAN_BUILD_COMMAND $cmake_command"
fi

if [[ "$build_arch" == "wasm" ]]; then
 cmake_command="emcmake $cmake_command"
fi

# Include CMAKE_USER_MAKE_RULES_OVERRIDE as uninitialized since it will hold its value in the CMake cache otherwise can cause issues when branch switching
$cmake_command \
 -G "$generator" \
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/common/platform-matrix.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -169,7 +169,7 @@ jobs:
 archType: wasm
 platform: WebAssembly_wasm
 container:
 image: ubuntu-16.04-20200401182342-fe8b85d
 image: ubuntu-18.04-webassembly-20200409132031-f70ea41
 registry: mcr
 jobParameters:
 runtimeFlavor: ${{ parameters.runtimeFlavor }}
Expand Down

5 changes: 1 addition & 4 deletions
eng/pipelines/libraries/base-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,7 @@ jobs:
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubGroup, ''), eq(parameters.archType, 'arm')) }}:
 - _runtimeOSArg: /p:RuntimeOS=ubuntu.16.04

 # force a value for OS when cross-building WebAssembly
 - ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
 - _runtimeOSArg: -os ${{ parameters.osGroup }}

Expand DownExpand Up@@ -107,10 +108,6 @@ jobs:
 - _runtimeArtifactsPathArg: ' /p:RuntimeArtifactsPath=$(_runtimeDownloadPath)'
 - _testRunNamePrefixSuffix: $(runtimeFlavorName)_${{ parameters.liveRuntimeBuildConfig }}

 # WebAssembly uses linux implementation detail
 - ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
 - _runtimeArtifactName: 'CoreLib_Linux_x64_${{ parameters.liveRuntimeBuildConfig }}'

 # Windows variables
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 - _runtimeOSArg: /p:RuntimeOS=win10
Expand Down

24 changes: 6 additions & 18 deletions
eng/pipelines/libraries/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,21 +49,18 @@ jobs:

 ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}:
 dependsOn:
 - ${{ if ne(parameters.osGroup, 'WebAssembly') }}:
 # Use corelib dependencies for coreclr and non test builds
 - ${{ if and(eq(parameters.runtimeFlavor, 'coreclr'), eq(parameters.testScope, '')) }}:
 - ${{ format('coreclr_corelib_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}
 - ${{ if or(ne(parameters.runtimeFlavor, 'coreclr'), ne(parameters.testScope, '')) }}:
 - ${{ format('{0}_product_build_{1}{2}_{3}_{4}', parameters.runtimeFlavor, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}
 - ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
 - ${{ format('coreclr_corelib_build_{1}{2}_{3}_{4}', parameters.runtimeFlavor, 'linux', parameters.osSubgroup, 'x64', parameters.liveRuntimeBuildConfig) }}
 # Use corelib dependencies for coreclr and non test builds
 - ${{ if and(eq(parameters.runtimeFlavor, 'coreclr'), eq(parameters.testScope, '')) }}:
 - ${{ format('coreclr_corelib_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}
 - ${{ if or(ne(parameters.runtimeFlavor, 'coreclr'), ne(parameters.testScope, '')) }}:
 - ${{ format('{0}_product_build_{1}{2}_{3}_{4}', parameters.runtimeFlavor, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}

 variables:
 - _subset: libs
 - _addtionalBuildArguments: ''
 - ${{ parameters.variables }}
 - ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
 - EMSDK_PATH: $(Build.BinariesDirectory)/emsdk
 - EMSDK_PATH: /usr/local/emscripten
Comment thread
vargaz marked this conversation as resolved.

 - ${{ if eq(parameters.runTests, true) }}:
 - _subset: libs+libs.tests
 - _addtionalBuildArguments: /p:ArchiveTests=true
Expand All@@ -80,15 +77,6 @@ jobs:
 ln -s /usr/local/opt/openssl/lib/pkgconfig/openssl.pc /usr/local/lib/pkgconfig/
 displayName: Install Build Dependencies

 - ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
 - script: |
 EMSCRIPTEN_VERSION=1.38.47
 git clone https://github.com/emscripten-core/emsdk.git $(EMSDK_PATH)
 cd $(EMSDK_PATH)
 ./emsdk install ${EMSCRIPTEN_VERSION}-upstream
 ./emsdk activate --embedded ${EMSCRIPTEN_VERSION}-upstream
 displayName: Install Emscripten

 - ${{ if eq(parameters.isOfficialBuild, true) }}:
 - template: /eng/pipelines/common/restore-internal-tools.yml
 parameters:
Expand Down

7 changes: 7 additions & 0 deletions
eng/pipelines/mono/templates/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,13 @@ jobs:
 - ${{ if eq(parameters.osGroup, 'Android') }}:
 - name: osOverride
 value: -os Android
 - ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
 - name: EMSDK_PATH
 value: /usr/local/emscripten
 - name: archType
 value: wasm
 - name: osOverride
 value: '-os WebAssembly'
 - ${{ parameters.variables }}

 steps:
Expand Down

5 changes: 4 additions & 1 deletion
eng/pipelines/runtime.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -266,6 +266,7 @@ jobs:
 - Linux_arm
 - Linux_arm64
 - Linux_musl_x64
 - WebAssembly_wasm
 # - Linux_musl_arm64
 - Windows_NT_x64
 # - Windows_NT_x86
Expand DownExpand Up@@ -302,6 +303,7 @@ jobs:
 - Linux_arm
 - Linux_arm64
 - Linux_musl_x64
 - WebAssembly_wasm
 # - Linux_musl_arm64
 - Windows_NT_x64
 # - Windows_NT_x86
Expand DownExpand Up@@ -420,6 +422,7 @@ jobs:
 # - iOS_arm # https://github.com/dotnet/runtime/issues/34465
 - iOS_arm64
 - iOS_x64
 - WebAssembly_wasm
 jobParameters:
 liveRuntimeBuildConfig: release

Expand All@@ -438,6 +441,7 @@ jobs:
 # - iOS_arm # https://github.com/dotnet/runtime/issues/34465
 - iOS_arm64
 - iOS_x64
 - WebAssembly_wasm
 jobParameters:
 liveRuntimeBuildConfig: debug

Expand All@@ -449,7 +453,6 @@ jobs:
 jobTemplate: /eng/pipelines/libraries/build-job.yml
 buildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
 platforms:
 - WebAssembly_wasm
 - ${{ if eq(variables['isFullMatrix'], false) }}:
 - Windows_NT_x86
 jobParameters:
Expand Down

3 changes: 3 additions & 0 deletions
src/libraries/Native/Unix/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,9 @@ elseif (CLR_CMAKE_TARGET_ARCH_I386)
 add_definitions(-DTARGET_32BIT=1)
 add_definitions(-DTARGET_X86)
 add_definitions(-D_FILE_OFFSET_BITS=64)
elseif (CLR_CMAKE_TARGET_ARCH_WASM)
 add_definitions(-DTARGET_32BIT=1)
 add_definitions(-DTARGET_WASM)
elseif (CLR_CMAKE_TARGET_ARCH_ARM64)
 add_definitions(-DTARGET_64BIT=1)
 add_definitions(-DTARGET_ARM64)
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/Native/Unix/System.IO.Compression.Native/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
project(System.IO.Compression.Native C)

if (CLR_CMAKE_TARGET_WASM)
if (CLR_CMAKE_TARGET_ARCH_WASM)
 add_definitions(-s USE_ZLIB)
elseif (CLR_CMAKE_TARGET_ANDROID)
 # need special case here since we want to link against libz.so but find_package() would resolve libz.a
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/Native/Unix/System.Native/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ else ()
 set(NATIVE_SOURCES ${NATIVE_SOURCES} pal_console.c)
endif ()

if (CLR_CMAKE_TARGET_LINUX)
if (CLR_CMAKE_TARGET_LINUX AND NOT CLR_CMAKE_TARGET_ARCH_WASM)
 set(NATIVE_SOURCES ${NATIVE_SOURCES} pal_networkchange.c)

 if (!HAVE_LINUX_RTNETLINK_H)
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/Native/Unix/System.Native/pal_runtimeinformation.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ int32_t SystemNative_GetOSArchitecture()
 return ARCH_ARM64;
#elif defined(TARGET_AMD64)
 return ARCH_X64;
#elif defined(TARGET_X86)
#elif defined(TARGET_X86) || defined(TARGET_WASM) // TODO: add arch for WASM
 return ARCH_X86;
#else
#error Unidentified Architecture
Expand All@@ -71,7 +71,7 @@ int32_t SystemNative_GetProcessArchitecture()
 return ARCH_ARM64;
#elif defined(TARGET_AMD64)
 return ARCH_X64;
#elif defined(TARGET_X86)
#elif defined(TARGET_X86) || defined(TARGET_WASM) // TODO: add arch for WASM
 return ARCH_X86;
#else
#error Unidentified Architecture
Expand Down

6 changes: 3 additions & 3 deletions
src/libraries/Native/Unix/configure.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,8 @@ include(CheckTypeSize)

if (CLR_CMAKE_TARGET_ANDROID)
 set(PAL_UNIX_NAME \"ANDROID\")
elseif (CLR_CMAKE_TARGET_ARCH_WASM)
 set(PAL_UNIX_NAME \"WEBASSEMBLY\")
elseif (CLR_CMAKE_TARGET_LINUX)
 set(PAL_UNIX_NAME \"LINUX\")
elseif (CLR_CMAKE_TARGET_OSX)
Expand All@@ -28,8 +30,6 @@ elseif (CLR_CMAKE_TARGET_FREEBSD)
 set(CMAKE_REQUIRED_INCLUDES ${CROSS_ROOTFS}/usr/local/include)
elseif (CLR_CMAKE_TARGET_NETBSD)
 set(PAL_UNIX_NAME \"NETBSD\")
elseif (CLR_CMAKE_TARGET_ARCH_WASM)
 set(PAL_UNIX_NAME \"WEBASSEMBLY\")
else ()
 message(FATAL_ERROR "Unknown platform. Cannot define PAL_UNIX_NAME, used by RuntimeInformation.")
endif ()
Expand DownExpand Up@@ -839,7 +839,7 @@ set (CMAKE_REQUIRED_LIBRARIES ${PREVIOUS_CMAKE_REQUIRED_LIBRARIES})
set (HAVE_INOTIFY 0)
if (HAVE_INOTIFY_INIT AND HAVE_INOTIFY_ADD_WATCH AND HAVE_INOTIFY_RM_WATCH)
 set (HAVE_INOTIFY 1)
elseif (CLR_CMAKE_TARGET_LINUX)
elseif (CLR_CMAKE_TARGET_LINUX AND NOT CLR_CMAKE_TARGET_ARCH_WASM)
 message(FATAL_ERROR "Cannot find inotify functions on a Linux platform.")
endif()

Expand Down

5 changes: 4 additions & 1 deletion
src/libraries/Native/build-native.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,10 +49,13 @@ source "$__RepoRootDir"/eng/native/build-commons.sh

if [[ "$__BuildArch" == wasm ]]; then
 if [[ -z "$EMSDK_PATH" ]]; then
 echo "Error: Should set EMSDK_PATH environment variable pointing to emsdk root."
 echo "Error: You need to set the EMSDK_PATH environment variable pointing to the emscripten SDK root."
 exit 1
 fi
 source "$EMSDK_PATH"/emsdk_env.sh

 export CLR_CC=$(which emcc)
 export CLR_CXX=$(which em++)

Comment on lines

+57
 to 
+58

@am11am11Apr 13, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A nit, typically posix-y command -v is preferred over which in this repo. (same goes for which false below)
@akoeplingerakoeplingerApr 14, 2020•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@am11 I tried that but it didn't work since we expect the full path in CLR_CC and command -v doesn't do that (for false at least)
elif [[ "$__TargetOS" == iOS ]]; then
 # nothing to do here
 true
Expand Down

3 changes: 2 additions & 1 deletion
src/mono/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,8 +42,9 @@
 <TargetsiOSSimulator Condition="'$(TargetsiOS)' == 'true' and '$(Platform)' == 'x64'">true</TargetsiOSSimulator>
 <TargetstvOSSimulator Condition="'$(TargetstvOS)' == 'true' and '$(Platform)' == 'x64'">true</TargetstvOSSimulator>
 <TargetsAndroid Condition="'$(TargetOS)' == 'Android'">true</TargetsAndroid>
 <TargetsWASM Condition="'$(TargetOS)' == 'WebAssembly'">true</TargetsWASM>
 <TargetsWindows Condition="'$(TargetOS)' == 'Windows_NT'">true</TargetsWindows>
 <TargetsUnix Condition="'$(TargetsFreeBSD)' == 'true' or '$(TargetsLinux)' == 'true' or '$(TargetsNetBSD)' == 'true' or '$(TargetsOSX)' == 'true' or '$(TargetstvOS)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetsAndroid)' == 'true'">true</TargetsUnix>
 <TargetsUnix Condition="'$(TargetsFreeBSD)' == 'true' or '$(TargetsLinux)' == 'true' or '$(TargetsNetBSD)' == 'true' or '$(TargetsOSX)' == 'true' or '$(TargetstvOS)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetsAndroid)' == 'true' or '$(TargetsWASM)' == 'true'">true</TargetsUnix>
 </PropertyGroup>

 <PropertyGroup>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add beginnings of WebAssembly build support for mono.#33551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

akoeplinger
merged 10 commits into

from

Apr 10, 2020
 Merged


Add beginnings of WebAssembly build support for mono.
#33551
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
7703390

Add beginnings of WebAssembly build support for mono.


vargaz Apr 3, 2020
b803077

Add beginnings of WebAssembly build support for mono.


vargaz Apr 3, 2020
5638e2b

Merge branch 'master' into wasm-build


akoeplinger Apr 7, 2020
03bd7da

Set emcc as the compiler for libraries build


akoeplinger Apr 7, 2020
9712249

Add default subsets for webassembly build


akoeplinger Apr 7, 2020
73d2a7c

Use WebAssembly Docker image


akoeplinger Apr 7, 2020
9e130dc

Fix various problems in the build


akoeplinger Apr 7, 2020
74819de

Merge remote-tracking branch 'upstream/master' into wasm-build


akoeplinger Apr 9, 2020
1da9cc8

Bump webassembly image


akoeplinger Apr 9, 2020
a4b955f

Use Mono runtime for webassembly builds


akoeplinger Apr 9, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
eng/Subsets.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@
 <PropertyGroup>
 <DefaultSubsets>clr+mono+libs+installer</DefaultSubsets>
 <DefaultSubsets Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'Android' or '$(TargetOS)' == 'tvOS'">mono+libs+installer</DefaultSubsets>
 <DefaultSubsetCategories Condition="'$(TargetOS)' == 'WebAssembly'">mono+libs</DefaultSubsetCategories>
 </PropertyGroup>

 <PropertyGroup>
Expand DownExpand Up@@ -66,7 +67,7 @@
 </PropertyGroup>

 <PropertyGroup>
 <RuntimeFlavor Condition="'$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'Android'">Mono</RuntimeFlavor>
 <RuntimeFlavor Condition="'$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'Android' or '$(TargetOS)' == 'WebAssembly'">Mono</RuntimeFlavor>
 <RuntimeFlavor Condition="'$(RuntimeFlavor)' == '' and $(_subset.Contains('+mono.runtime+')) and !$(_subset.Contains('+clr.runtime+'))">Mono</RuntimeFlavor>
 <RuntimeFlavor Condition="'$(RuntimeFlavor)' == ''">CoreCLR</RuntimeFlavor>
 </PropertyGroup>
Expand Down

9 changes: 7 additions & 2 deletions
eng/native/build-commons.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -151,8 +151,13 @@ build_native()

 popd
 else
 echo "Executing cmake --build \"$intermediatesDir\" --target install -j $__NumProc"
 cmake --build "$intermediatesDir" --target install -j "$__NumProc"
 cmake_command=cmake
 if [[ "$build_arch" == "wasm" ]]; then
 cmake_command="emcmake $cmake_command"
 fi

 echo "Executing $cmake_command --build \"$intermediatesDir\" --target install -j $__NumProc"
 $cmake_command --build "$intermediatesDir" --target install -j "$__NumProc"
 fi

 local exit_code="$?"
Expand Down

20 changes: 17 additions & 3 deletions
eng/native/configureplatform.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -166,7 +166,8 @@ if(CLR_CMAKE_HOST_OS STREQUAL Windows)
endif(CLR_CMAKE_HOST_OS STREQUAL Windows)

if(CLR_CMAKE_HOST_OS STREQUAL Emscripten)
 set(CLR_CMAKE_HOST_ARCH_WASM 1)
 #set(CLR_CMAKE_HOST_UNIX 1) # TODO: this should be reenabled but it activates a bunch of additional compiler flags in configurecompiler.cmake
 set(CLR_CMAKE_HOST_UNIX_WASM 1)
endif(CLR_CMAKE_HOST_OS STREQUAL Emscripten)

#--------------------------------------------
Expand DownExpand Up@@ -196,6 +197,9 @@ elseif(CLR_CMAKE_HOST_UNIX_AMD64)
elseif(CLR_CMAKE_HOST_UNIX_X86)
 set(CLR_CMAKE_HOST_ARCH_I386 1)
 set(CLR_CMAKE_HOST_ARCH "x86")
elseif(CLR_CMAKE_HOST_UNIX_WASM)
 set(CLR_CMAKE_HOST_ARCH_WASM 1)
 set(CLR_CMAKE_HOST_ARCH "wasm")
elseif(WIN32)
 # CLR_CMAKE_HOST_ARCH is passed in as param to cmake
 if (CLR_CMAKE_HOST_ARCH STREQUAL x64)
Expand DownExpand Up@@ -237,6 +241,8 @@ if (CLR_CMAKE_TARGET_ARCH STREQUAL x64)
 set(CLR_CMAKE_TARGET_ARCH_ARM 1)
 set(CLR_CMAKE_TARGET_ARCH_ARMV7L 1)
 set(ARM_SOFTFP 1)
 elseif(CLR_CMAKE_TARGET_ARCH STREQUAL wasm)
 set(CLR_CMAKE_TARGET_ARCH_WASM 1)
 else()
 clr_unknown_arch()
endif()
Expand DownExpand Up@@ -306,6 +312,12 @@ if(CLR_CMAKE_TARGET_OS STREQUAL SunOS)
 set(CLR_CMAKE_TARGET_SUNOS 1)
endif(CLR_CMAKE_TARGET_OS STREQUAL SunOS)

if(CLR_CMAKE_TARGET_OS STREQUAL Emscripten)
 set(CLR_CMAKE_TARGET_UNIX 1)
 set(CLR_CMAKE_TARGET_LINUX 1)
 set(CLR_CMAKE_TARGET_EMSCRIPTEN 1)
endif(CLR_CMAKE_TARGET_OS STREQUAL Emscripten)

if(CLR_CMAKE_TARGET_UNIX)
 if(CLR_CMAKE_TARGET_ARCH STREQUAL x64)
 set(CLR_CMAKE_TARGET_UNIX_AMD64 1)
Expand All@@ -317,6 +329,8 @@ if(CLR_CMAKE_TARGET_UNIX)
 set(CLR_CMAKE_TARGET_UNIX_ARM64 1)
 elseif(CLR_CMAKE_TARGET_ARCH STREQUAL x86)
 set(CLR_CMAKE_TARGET_UNIX_X86 1)
 elseif(CLR_CMAKE_TARGET_ARCH STREQUAL wasm)
 set(CLR_CMAKE_TARGET_UNIX_WASM 1)
 else()
 clr_unknown_arch()
 endif()
Expand All@@ -343,7 +357,7 @@ else()
 endif()
endif()

if(NOT CLR_CMAKE_HOST_ARCH_WASM)
if(NOT CLR_CMAKE_TARGET_EMSCRIPTEN)
 # Skip check_pie_supported call on Android as ld from llvm toolchain with NDK API level 21
 # complains about missing linker flag `-no-pie` (while level 28's ld does support this flag,
 # but since we know that PIE is supported, we can safely skip this redundant check).
Expand All@@ -363,7 +377,7 @@ if(NOT CLR_CMAKE_HOST_ARCH_WASM)
 endif(NOT CLR_CMAKE_TARGET_ANDROID)

 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
endif(NOT CLR_CMAKE_HOST_ARCH_WASM)
endif(NOT CLR_CMAKE_TARGET_EMSCRIPTEN)

string(TOLOWER "${CMAKE_BUILD_TYPE}" LOWERCASE_CMAKE_BUILD_TYPE)
if(LOWERCASE_CMAKE_BUILD_TYPE STREQUAL debug)
Expand Down

2 changes: 1 addition & 1 deletion
eng/native/configuretools.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ if (CMAKE_C_COMPILER MATCHES "-?[0-9]+(\.[0-9]+)?$")
 set(CLR_CMAKE_COMPILER_FILE_NAME_VERSION "${CMAKE_MATCH_0}")
endif()

if(NOT WIN32)
if(NOT WIN32 AND NOT CLR_CMAKE_TARGET_ARCH_WASM)
 if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 if(APPLE)
 set(TOOLSET_PREFIX "")
Expand Down

4 changes: 4 additions & 0 deletions
eng/native/gen-buildsys.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -87,6 +87,10 @@ if [[ "$scan_build" == "ON" && -n "$SCAN_BUILD_COMMAND" ]]; then
 cmake_command="$SCAN_BUILD_COMMAND $cmake_command"
fi

if [[ "$build_arch" == "wasm" ]]; then
 cmake_command="emcmake $cmake_command"
fi

# Include CMAKE_USER_MAKE_RULES_OVERRIDE as uninitialized since it will hold its value in the CMake cache otherwise can cause issues when branch switching
$cmake_command \
 -G "$generator" \
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/common/platform-matrix.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -169,7 +169,7 @@ jobs:
 archType: wasm
 platform: WebAssembly_wasm
 container:
 image: ubuntu-16.04-20200401182342-fe8b85d
 image: ubuntu-18.04-webassembly-20200409132031-f70ea41
 registry: mcr
 jobParameters:
 runtimeFlavor: ${{ parameters.runtimeFlavor }}
Expand Down

5 changes: 1 addition & 4 deletions
eng/pipelines/libraries/base-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,7 @@ jobs:
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubGroup, ''), eq(parameters.archType, 'arm')) }}:
 - _runtimeOSArg: /p:RuntimeOS=ubuntu.16.04

 # force a value for OS when cross-building WebAssembly
 - ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
 - _runtimeOSArg: -os ${{ parameters.osGroup }}

Expand DownExpand Up@@ -107,10 +108,6 @@ jobs:
 - _runtimeArtifactsPathArg: ' /p:RuntimeArtifactsPath=$(_runtimeDownloadPath)'
 - _testRunNamePrefixSuffix: $(runtimeFlavorName)_${{ parameters.liveRuntimeBuildConfig }}

 # WebAssembly uses linux implementation detail
 - ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
 - _runtimeArtifactName: 'CoreLib_Linux_x64_${{ parameters.liveRuntimeBuildConfig }}'

 # Windows variables
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 - _runtimeOSArg: /p:RuntimeOS=win10
Expand Down

24 changes: 6 additions & 18 deletions
eng/pipelines/libraries/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,21 +49,18 @@ jobs:

 ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}:
 dependsOn:
 - ${{ if ne(parameters.osGroup, 'WebAssembly') }}:
 # Use corelib dependencies for coreclr and non test builds
 - ${{ if and(eq(parameters.runtimeFlavor, 'coreclr'), eq(parameters.testScope, '')) }}:
 - ${{ format('coreclr_corelib_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}
 - ${{ if or(ne(parameters.runtimeFlavor, 'coreclr'), ne(parameters.testScope, '')) }}:
 - ${{ format('{0}_product_build_{1}{2}_{3}_{4}', parameters.runtimeFlavor, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}
 - ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
 - ${{ format('coreclr_corelib_build_{1}{2}_{3}_{4}', parameters.runtimeFlavor, 'linux', parameters.osSubgroup, 'x64', parameters.liveRuntimeBuildConfig) }}
 # Use corelib dependencies for coreclr and non test builds
 - ${{ if and(eq(parameters.runtimeFlavor, 'coreclr'), eq(parameters.testScope, '')) }}:
 - ${{ format('coreclr_corelib_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}
 - ${{ if or(ne(parameters.runtimeFlavor, 'coreclr'), ne(parameters.testScope, '')) }}:
 - ${{ format('{0}_product_build_{1}{2}_{3}_{4}', parameters.runtimeFlavor, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}

 variables:
 - _subset: libs
 - _addtionalBuildArguments: ''
 - ${{ parameters.variables }}
 - ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
 - EMSDK_PATH: $(Build.BinariesDirectory)/emsdk
 - EMSDK_PATH: /usr/local/emscripten
Comment thread
vargaz marked this conversation as resolved.

 - ${{ if eq(parameters.runTests, true) }}:
 - _subset: libs+libs.tests
 - _addtionalBuildArguments: /p:ArchiveTests=true
Expand All@@ -80,15 +77,6 @@ jobs:
 ln -s /usr/local/opt/openssl/lib/pkgconfig/openssl.pc /usr/local/lib/pkgconfig/
 displayName: Install Build Dependencies

 - ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
 - script: |
 EMSCRIPTEN_VERSION=1.38.47
 git clone https://github.com/emscripten-core/emsdk.git $(EMSDK_PATH)
 cd $(EMSDK_PATH)
 ./emsdk install ${EMSCRIPTEN_VERSION}-upstream
 ./emsdk activate --embedded ${EMSCRIPTEN_VERSION}-upstream
 displayName: Install Emscripten

 - ${{ if eq(parameters.isOfficialBuild, true) }}:
 - template: /eng/pipelines/common/restore-internal-tools.yml
 parameters:
Expand Down

7 changes: 7 additions & 0 deletions
eng/pipelines/mono/templates/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,13 @@ jobs:
 - ${{ if eq(parameters.osGroup, 'Android') }}:
 - name: osOverride
 value: -os Android
 - ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
 - name: EMSDK_PATH
 value: /usr/local/emscripten
 - name: archType
 value: wasm
 - name: osOverride
 value: '-os WebAssembly'
 - ${{ parameters.variables }}

 steps:
Expand Down

5 changes: 4 additions & 1 deletion
eng/pipelines/runtime.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -266,6 +266,7 @@ jobs:
 - Linux_arm
 - Linux_arm64
 - Linux_musl_x64
 - WebAssembly_wasm
 # - Linux_musl_arm64
 - Windows_NT_x64
 # - Windows_NT_x86
Expand DownExpand Up@@ -302,6 +303,7 @@ jobs:
 - Linux_arm
 - Linux_arm64
 - Linux_musl_x64
 - WebAssembly_wasm
 # - Linux_musl_arm64
 - Windows_NT_x64
 # - Windows_NT_x86
Expand DownExpand Up@@ -420,6 +422,7 @@ jobs:
 # - iOS_arm # https://github.com/dotnet/runtime/issues/34465
 - iOS_arm64
 - iOS_x64
 - WebAssembly_wasm
 jobParameters:
 liveRuntimeBuildConfig: release

Expand All@@ -438,6 +441,7 @@ jobs:
 # - iOS_arm # https://github.com/dotnet/runtime/issues/34465
 - iOS_arm64
 - iOS_x64
 - WebAssembly_wasm
 jobParameters:
 liveRuntimeBuildConfig: debug

Expand All@@ -449,7 +453,6 @@ jobs:
 jobTemplate: /eng/pipelines/libraries/build-job.yml
 buildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
 platforms:
 - WebAssembly_wasm
 - ${{ if eq(variables['isFullMatrix'], false) }}:
 - Windows_NT_x86
 jobParameters:
Expand Down

3 changes: 3 additions & 0 deletions
src/libraries/Native/Unix/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,9 @@ elseif (CLR_CMAKE_TARGET_ARCH_I386)
 add_definitions(-DTARGET_32BIT=1)
 add_definitions(-DTARGET_X86)
 add_definitions(-D_FILE_OFFSET_BITS=64)
elseif (CLR_CMAKE_TARGET_ARCH_WASM)
 add_definitions(-DTARGET_32BIT=1)
 add_definitions(-DTARGET_WASM)
elseif (CLR_CMAKE_TARGET_ARCH_ARM64)
 add_definitions(-DTARGET_64BIT=1)
 add_definitions(-DTARGET_ARM64)
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/Native/Unix/System.IO.Compression.Native/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
project(System.IO.Compression.Native C)

if (CLR_CMAKE_TARGET_WASM)
if (CLR_CMAKE_TARGET_ARCH_WASM)
 add_definitions(-s USE_ZLIB)
elseif (CLR_CMAKE_TARGET_ANDROID)
 # need special case here since we want to link against libz.so but find_package() would resolve libz.a
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/Native/Unix/System.Native/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ else ()
 set(NATIVE_SOURCES ${NATIVE_SOURCES} pal_console.c)
endif ()

if (CLR_CMAKE_TARGET_LINUX)
if (CLR_CMAKE_TARGET_LINUX AND NOT CLR_CMAKE_TARGET_ARCH_WASM)
 set(NATIVE_SOURCES ${NATIVE_SOURCES} pal_networkchange.c)

 if (!HAVE_LINUX_RTNETLINK_H)
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/Native/Unix/System.Native/pal_runtimeinformation.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ int32_t SystemNative_GetOSArchitecture()
 return ARCH_ARM64;
#elif defined(TARGET_AMD64)
 return ARCH_X64;
#elif defined(TARGET_X86)
#elif defined(TARGET_X86) || defined(TARGET_WASM) // TODO: add arch for WASM
 return ARCH_X86;
#else
#error Unidentified Architecture
Expand All@@ -71,7 +71,7 @@ int32_t SystemNative_GetProcessArchitecture()
 return ARCH_ARM64;
#elif defined(TARGET_AMD64)
 return ARCH_X64;
#elif defined(TARGET_X86)
#elif defined(TARGET_X86) || defined(TARGET_WASM) // TODO: add arch for WASM
 return ARCH_X86;
#else
#error Unidentified Architecture
Expand Down

6 changes: 3 additions & 3 deletions
src/libraries/Native/Unix/configure.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,8 @@ include(CheckTypeSize)

if (CLR_CMAKE_TARGET_ANDROID)
 set(PAL_UNIX_NAME \"ANDROID\")
elseif (CLR_CMAKE_TARGET_ARCH_WASM)
 set(PAL_UNIX_NAME \"WEBASSEMBLY\")
elseif (CLR_CMAKE_TARGET_LINUX)
 set(PAL_UNIX_NAME \"LINUX\")
elseif (CLR_CMAKE_TARGET_OSX)
Expand All@@ -28,8 +30,6 @@ elseif (CLR_CMAKE_TARGET_FREEBSD)
 set(CMAKE_REQUIRED_INCLUDES ${CROSS_ROOTFS}/usr/local/include)
elseif (CLR_CMAKE_TARGET_NETBSD)
 set(PAL_UNIX_NAME \"NETBSD\")
elseif (CLR_CMAKE_TARGET_ARCH_WASM)
 set(PAL_UNIX_NAME \"WEBASSEMBLY\")
else ()
 message(FATAL_ERROR "Unknown platform. Cannot define PAL_UNIX_NAME, used by RuntimeInformation.")
endif ()
Expand DownExpand Up@@ -839,7 +839,7 @@ set (CMAKE_REQUIRED_LIBRARIES ${PREVIOUS_CMAKE_REQUIRED_LIBRARIES})
set (HAVE_INOTIFY 0)
if (HAVE_INOTIFY_INIT AND HAVE_INOTIFY_ADD_WATCH AND HAVE_INOTIFY_RM_WATCH)
 set (HAVE_INOTIFY 1)
elseif (CLR_CMAKE_TARGET_LINUX)
elseif (CLR_CMAKE_TARGET_LINUX AND NOT CLR_CMAKE_TARGET_ARCH_WASM)
 message(FATAL_ERROR "Cannot find inotify functions on a Linux platform.")
endif()

Expand Down

5 changes: 4 additions & 1 deletion
src/libraries/Native/build-native.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,10 +49,13 @@ source "$__RepoRootDir"/eng/native/build-commons.sh

if [[ "$__BuildArch" == wasm ]]; then
 if [[ -z "$EMSDK_PATH" ]]; then
 echo "Error: Should set EMSDK_PATH environment variable pointing to emsdk root."
 echo "Error: You need to set the EMSDK_PATH environment variable pointing to the emscripten SDK root."
 exit 1
 fi
 source "$EMSDK_PATH"/emsdk_env.sh

 export CLR_CC=$(which emcc)
 export CLR_CXX=$(which em++)

Comment on lines

+57
 to 
+58

@am11am11Apr 13, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A nit, typically posix-y command -v is preferred over which in this repo. (same goes for which false below)
@akoeplingerakoeplingerApr 14, 2020•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@am11 I tried that but it didn't work since we expect the full path in CLR_CC and command -v doesn't do that (for false at least)
elif [[ "$__TargetOS" == iOS ]]; then
 # nothing to do here
 true
Expand Down

3 changes: 2 additions & 1 deletion
src/mono/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,8 +42,9 @@
 <TargetsiOSSimulator Condition="'$(TargetsiOS)' == 'true' and '$(Platform)' == 'x64'">true</TargetsiOSSimulator>
 <TargetstvOSSimulator Condition="'$(TargetstvOS)' == 'true' and '$(Platform)' == 'x64'">true</TargetstvOSSimulator>
 <TargetsAndroid Condition="'$(TargetOS)' == 'Android'">true</TargetsAndroid>
 <TargetsWASM Condition="'$(TargetOS)' == 'WebAssembly'">true</TargetsWASM>
 <TargetsWindows Condition="'$(TargetOS)' == 'Windows_NT'">true</TargetsWindows>
 <TargetsUnix Condition="'$(TargetsFreeBSD)' == 'true' or '$(TargetsLinux)' == 'true' or '$(TargetsNetBSD)' == 'true' or '$(TargetsOSX)' == 'true' or '$(TargetstvOS)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetsAndroid)' == 'true'">true</TargetsUnix>
 <TargetsUnix Condition="'$(TargetsFreeBSD)' == 'true' or '$(TargetsLinux)' == 'true' or '$(TargetsNetBSD)' == 'true' or '$(TargetsOSX)' == 'true' or '$(TargetstvOS)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetsAndroid)' == 'true' or '$(TargetsWASM)' == 'true'">true</TargetsUnix>
 </PropertyGroup>

 <PropertyGroup>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Add beginnings of WebAssembly build support for mono.#33551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

akoeplinger
merged 10 commits into

from

Apr 10, 2020
 Merged


Add beginnings of WebAssembly build support for mono.
#33551
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
7703390

Add beginnings of WebAssembly build support for mono.


vargaz Apr 3, 2020
b803077

Add beginnings of WebAssembly build support for mono.


vargaz Apr 3, 2020
5638e2b

Merge branch 'master' into wasm-build


akoeplinger Apr 7, 2020
03bd7da

Set emcc as the compiler for libraries build


akoeplinger Apr 7, 2020
9712249

Add default subsets for webassembly build


akoeplinger Apr 7, 2020
73d2a7c

Use WebAssembly Docker image


akoeplinger Apr 7, 2020
9e130dc

Fix various problems in the build


akoeplinger Apr 7, 2020
74819de

Merge remote-tracking branch 'upstream/master' into wasm-build


akoeplinger Apr 9, 2020
1da9cc8

Bump webassembly image


akoeplinger Apr 9, 2020
a4b955f

Use Mono runtime for webassembly builds


akoeplinger Apr 9, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
eng/Subsets.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@
 <PropertyGroup>
 <DefaultSubsets>clr+mono+libs+installer</DefaultSubsets>
 <DefaultSubsets Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'Android' or '$(TargetOS)' == 'tvOS'">mono+libs+installer</DefaultSubsets>
 <DefaultSubsetCategories Condition="'$(TargetOS)' == 'WebAssembly'">mono+libs</DefaultSubsetCategories>
 </PropertyGroup>

 <PropertyGroup>
Expand DownExpand Up@@ -66,7 +67,7 @@
 </PropertyGroup>

 <PropertyGroup>
 <RuntimeFlavor Condition="'$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'Android'">Mono</RuntimeFlavor>
 <RuntimeFlavor Condition="'$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'Android' or '$(TargetOS)' == 'WebAssembly'">Mono</RuntimeFlavor>
 <RuntimeFlavor Condition="'$(RuntimeFlavor)' == '' and $(_subset.Contains('+mono.runtime+')) and !$(_subset.Contains('+clr.runtime+'))">Mono</RuntimeFlavor>
 <RuntimeFlavor Condition="'$(RuntimeFlavor)' == ''">CoreCLR</RuntimeFlavor>
 </PropertyGroup>
Expand Down

9 changes: 7 additions & 2 deletions
eng/native/build-commons.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -151,8 +151,13 @@ build_native()

 popd
 else
 echo "Executing cmake --build \"$intermediatesDir\" --target install -j $__NumProc"
 cmake --build "$intermediatesDir" --target install -j "$__NumProc"
 cmake_command=cmake
 if [[ "$build_arch" == "wasm" ]]; then
 cmake_command="emcmake $cmake_command"
 fi

 echo "Executing $cmake_command --build \"$intermediatesDir\" --target install -j $__NumProc"
 $cmake_command --build "$intermediatesDir" --target install -j "$__NumProc"
 fi

 local exit_code="$?"
Expand Down

20 changes: 17 additions & 3 deletions
eng/native/configureplatform.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -166,7 +166,8 @@ if(CLR_CMAKE_HOST_OS STREQUAL Windows)
endif(CLR_CMAKE_HOST_OS STREQUAL Windows)

if(CLR_CMAKE_HOST_OS STREQUAL Emscripten)
 set(CLR_CMAKE_HOST_ARCH_WASM 1)
 #set(CLR_CMAKE_HOST_UNIX 1) # TODO: this should be reenabled but it activates a bunch of additional compiler flags in configurecompiler.cmake
 set(CLR_CMAKE_HOST_UNIX_WASM 1)
endif(CLR_CMAKE_HOST_OS STREQUAL Emscripten)

#--------------------------------------------
Expand DownExpand Up@@ -196,6 +197,9 @@ elseif(CLR_CMAKE_HOST_UNIX_AMD64)
elseif(CLR_CMAKE_HOST_UNIX_X86)
 set(CLR_CMAKE_HOST_ARCH_I386 1)
 set(CLR_CMAKE_HOST_ARCH "x86")
elseif(CLR_CMAKE_HOST_UNIX_WASM)
 set(CLR_CMAKE_HOST_ARCH_WASM 1)
 set(CLR_CMAKE_HOST_ARCH "wasm")
elseif(WIN32)
 # CLR_CMAKE_HOST_ARCH is passed in as param to cmake
 if (CLR_CMAKE_HOST_ARCH STREQUAL x64)
Expand DownExpand Up@@ -237,6 +241,8 @@ if (CLR_CMAKE_TARGET_ARCH STREQUAL x64)
 set(CLR_CMAKE_TARGET_ARCH_ARM 1)
 set(CLR_CMAKE_TARGET_ARCH_ARMV7L 1)
 set(ARM_SOFTFP 1)
 elseif(CLR_CMAKE_TARGET_ARCH STREQUAL wasm)
 set(CLR_CMAKE_TARGET_ARCH_WASM 1)
 else()
 clr_unknown_arch()
endif()
Expand DownExpand Up@@ -306,6 +312,12 @@ if(CLR_CMAKE_TARGET_OS STREQUAL SunOS)
 set(CLR_CMAKE_TARGET_SUNOS 1)
endif(CLR_CMAKE_TARGET_OS STREQUAL SunOS)

if(CLR_CMAKE_TARGET_OS STREQUAL Emscripten)
 set(CLR_CMAKE_TARGET_UNIX 1)
 set(CLR_CMAKE_TARGET_LINUX 1)
 set(CLR_CMAKE_TARGET_EMSCRIPTEN 1)
endif(CLR_CMAKE_TARGET_OS STREQUAL Emscripten)

if(CLR_CMAKE_TARGET_UNIX)
 if(CLR_CMAKE_TARGET_ARCH STREQUAL x64)
 set(CLR_CMAKE_TARGET_UNIX_AMD64 1)
Expand All@@ -317,6 +329,8 @@ if(CLR_CMAKE_TARGET_UNIX)
 set(CLR_CMAKE_TARGET_UNIX_ARM64 1)
 elseif(CLR_CMAKE_TARGET_ARCH STREQUAL x86)
 set(CLR_CMAKE_TARGET_UNIX_X86 1)
 elseif(CLR_CMAKE_TARGET_ARCH STREQUAL wasm)
 set(CLR_CMAKE_TARGET_UNIX_WASM 1)
 else()
 clr_unknown_arch()
 endif()
Expand All@@ -343,7 +357,7 @@ else()
 endif()
endif()

if(NOT CLR_CMAKE_HOST_ARCH_WASM)
if(NOT CLR_CMAKE_TARGET_EMSCRIPTEN)
 # Skip check_pie_supported call on Android as ld from llvm toolchain with NDK API level 21
 # complains about missing linker flag `-no-pie` (while level 28's ld does support this flag,
 # but since we know that PIE is supported, we can safely skip this redundant check).
Expand All@@ -363,7 +377,7 @@ if(NOT CLR_CMAKE_HOST_ARCH_WASM)
 endif(NOT CLR_CMAKE_TARGET_ANDROID)

 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
endif(NOT CLR_CMAKE_HOST_ARCH_WASM)
endif(NOT CLR_CMAKE_TARGET_EMSCRIPTEN)

string(TOLOWER "${CMAKE_BUILD_TYPE}" LOWERCASE_CMAKE_BUILD_TYPE)
if(LOWERCASE_CMAKE_BUILD_TYPE STREQUAL debug)
Expand Down

2 changes: 1 addition & 1 deletion
eng/native/configuretools.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ if (CMAKE_C_COMPILER MATCHES "-?[0-9]+(\.[0-9]+)?$")
 set(CLR_CMAKE_COMPILER_FILE_NAME_VERSION "${CMAKE_MATCH_0}")
endif()

if(NOT WIN32)
if(NOT WIN32 AND NOT CLR_CMAKE_TARGET_ARCH_WASM)
 if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 if(APPLE)
 set(TOOLSET_PREFIX "")
Expand Down

4 changes: 4 additions & 0 deletions
eng/native/gen-buildsys.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -87,6 +87,10 @@ if [[ "$scan_build" == "ON" && -n "$SCAN_BUILD_COMMAND" ]]; then
 cmake_command="$SCAN_BUILD_COMMAND $cmake_command"
fi

if [[ "$build_arch" == "wasm" ]]; then
 cmake_command="emcmake $cmake_command"
fi

# Include CMAKE_USER_MAKE_RULES_OVERRIDE as uninitialized since it will hold its value in the CMake cache otherwise can cause issues when branch switching
$cmake_command \
 -G "$generator" \
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/common/platform-matrix.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -169,7 +169,7 @@ jobs:
 archType: wasm
 platform: WebAssembly_wasm
 container:
 image: ubuntu-16.04-20200401182342-fe8b85d
 image: ubuntu-18.04-webassembly-20200409132031-f70ea41
 registry: mcr
 jobParameters:
 runtimeFlavor: ${{ parameters.runtimeFlavor }}
Expand Down

5 changes: 1 addition & 4 deletions
eng/pipelines/libraries/base-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,7 @@ jobs:
 - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubGroup, ''), eq(parameters.archType, 'arm')) }}:
 - _runtimeOSArg: /p:RuntimeOS=ubuntu.16.04

 # force a value for OS when cross-building WebAssembly
 - ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
 - _runtimeOSArg: -os ${{ parameters.osGroup }}

Expand DownExpand Up@@ -107,10 +108,6 @@ jobs:
 - _runtimeArtifactsPathArg: ' /p:RuntimeArtifactsPath=$(_runtimeDownloadPath)'
 - _testRunNamePrefixSuffix: $(runtimeFlavorName)_${{ parameters.liveRuntimeBuildConfig }}

 # WebAssembly uses linux implementation detail
 - ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
 - _runtimeArtifactName: 'CoreLib_Linux_x64_${{ parameters.liveRuntimeBuildConfig }}'

 # Windows variables
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 - _runtimeOSArg: /p:RuntimeOS=win10
Expand Down

24 changes: 6 additions & 18 deletions
eng/pipelines/libraries/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,21 +49,18 @@ jobs:

 ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}:
 dependsOn:
 - ${{ if ne(parameters.osGroup, 'WebAssembly') }}:
 # Use corelib dependencies for coreclr and non test builds
 - ${{ if and(eq(parameters.runtimeFlavor, 'coreclr'), eq(parameters.testScope, '')) }}:
 - ${{ format('coreclr_corelib_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}
 - ${{ if or(ne(parameters.runtimeFlavor, 'coreclr'), ne(parameters.testScope, '')) }}:
 - ${{ format('{0}_product_build_{1}{2}_{3}_{4}', parameters.runtimeFlavor, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}
 - ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
 - ${{ format('coreclr_corelib_build_{1}{2}_{3}_{4}', parameters.runtimeFlavor, 'linux', parameters.osSubgroup, 'x64', parameters.liveRuntimeBuildConfig) }}
 # Use corelib dependencies for coreclr and non test builds
 - ${{ if and(eq(parameters.runtimeFlavor, 'coreclr'), eq(parameters.testScope, '')) }}:
 - ${{ format('coreclr_corelib_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}
 - ${{ if or(ne(parameters.runtimeFlavor, 'coreclr'), ne(parameters.testScope, '')) }}:
 - ${{ format('{0}_product_build_{1}{2}_{3}_{4}', parameters.runtimeFlavor, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}

 variables:
 - _subset: libs
 - _addtionalBuildArguments: ''
 - ${{ parameters.variables }}
 - ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
 - EMSDK_PATH: $(Build.BinariesDirectory)/emsdk
 - EMSDK_PATH: /usr/local/emscripten
Comment thread
vargaz marked this conversation as resolved.

 - ${{ if eq(parameters.runTests, true) }}:
 - _subset: libs+libs.tests
 - _addtionalBuildArguments: /p:ArchiveTests=true
Expand All@@ -80,15 +77,6 @@ jobs:
 ln -s /usr/local/opt/openssl/lib/pkgconfig/openssl.pc /usr/local/lib/pkgconfig/
 displayName: Install Build Dependencies

 - ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
 - script: |
 EMSCRIPTEN_VERSION=1.38.47
 git clone https://github.com/emscripten-core/emsdk.git $(EMSDK_PATH)
 cd $(EMSDK_PATH)
 ./emsdk install ${EMSCRIPTEN_VERSION}-upstream
 ./emsdk activate --embedded ${EMSCRIPTEN_VERSION}-upstream
 displayName: Install Emscripten

 - ${{ if eq(parameters.isOfficialBuild, true) }}:
 - template: /eng/pipelines/common/restore-internal-tools.yml
 parameters:
Expand Down

7 changes: 7 additions & 0 deletions
eng/pipelines/mono/templates/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,13 @@ jobs:
 - ${{ if eq(parameters.osGroup, 'Android') }}:
 - name: osOverride
 value: -os Android
 - ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
 - name: EMSDK_PATH
 value: /usr/local/emscripten
 - name: archType
 value: wasm
 - name: osOverride
 value: '-os WebAssembly'
 - ${{ parameters.variables }}

 steps:
Expand Down

5 changes: 4 additions & 1 deletion
eng/pipelines/runtime.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -266,6 +266,7 @@ jobs:
 - Linux_arm
 - Linux_arm64
 - Linux_musl_x64
 - WebAssembly_wasm
 # - Linux_musl_arm64
 - Windows_NT_x64
 # - Windows_NT_x86
Expand DownExpand Up@@ -302,6 +303,7 @@ jobs:
 - Linux_arm
 - Linux_arm64
 - Linux_musl_x64
 - WebAssembly_wasm
 # - Linux_musl_arm64
 - Windows_NT_x64
 # - Windows_NT_x86
Expand DownExpand Up@@ -420,6 +422,7 @@ jobs:
 # - iOS_arm # https://github.com/dotnet/runtime/issues/34465
 - iOS_arm64
 - iOS_x64
 - WebAssembly_wasm
 jobParameters:
 liveRuntimeBuildConfig: release

Expand All@@ -438,6 +441,7 @@ jobs:
 # - iOS_arm # https://github.com/dotnet/runtime/issues/34465
 - iOS_arm64
 - iOS_x64
 - WebAssembly_wasm
 jobParameters:
 liveRuntimeBuildConfig: debug

Expand All@@ -449,7 +453,6 @@ jobs:
 jobTemplate: /eng/pipelines/libraries/build-job.yml
 buildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
 platforms:
 - WebAssembly_wasm
 - ${{ if eq(variables['isFullMatrix'], false) }}:
 - Windows_NT_x86
 jobParameters:
Expand Down

3 changes: 3 additions & 0 deletions
src/libraries/Native/Unix/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,9 @@ elseif (CLR_CMAKE_TARGET_ARCH_I386)
 add_definitions(-DTARGET_32BIT=1)
 add_definitions(-DTARGET_X86)
 add_definitions(-D_FILE_OFFSET_BITS=64)
elseif (CLR_CMAKE_TARGET_ARCH_WASM)
 add_definitions(-DTARGET_32BIT=1)
 add_definitions(-DTARGET_WASM)
elseif (CLR_CMAKE_TARGET_ARCH_ARM64)
 add_definitions(-DTARGET_64BIT=1)
 add_definitions(-DTARGET_ARM64)
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/Native/Unix/System.IO.Compression.Native/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
project(System.IO.Compression.Native C)

if (CLR_CMAKE_TARGET_WASM)
if (CLR_CMAKE_TARGET_ARCH_WASM)
 add_definitions(-s USE_ZLIB)
elseif (CLR_CMAKE_TARGET_ANDROID)
 # need special case here since we want to link against libz.so but find_package() would resolve libz.a
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/Native/Unix/System.Native/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ else ()
 set(NATIVE_SOURCES ${NATIVE_SOURCES} pal_console.c)
endif ()

if (CLR_CMAKE_TARGET_LINUX)
if (CLR_CMAKE_TARGET_LINUX AND NOT CLR_CMAKE_TARGET_ARCH_WASM)
 set(NATIVE_SOURCES ${NATIVE_SOURCES} pal_networkchange.c)

 if (!HAVE_LINUX_RTNETLINK_H)
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/Native/Unix/System.Native/pal_runtimeinformation.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ int32_t SystemNative_GetOSArchitecture()
 return ARCH_ARM64;
#elif defined(TARGET_AMD64)
 return ARCH_X64;
#elif defined(TARGET_X86)
#elif defined(TARGET_X86) || defined(TARGET_WASM) // TODO: add arch for WASM
 return ARCH_X86;
#else
#error Unidentified Architecture
Expand All@@ -71,7 +71,7 @@ int32_t SystemNative_GetProcessArchitecture()
 return ARCH_ARM64;
#elif defined(TARGET_AMD64)
 return ARCH_X64;
#elif defined(TARGET_X86)
#elif defined(TARGET_X86) || defined(TARGET_WASM) // TODO: add arch for WASM
 return ARCH_X86;
#else
#error Unidentified Architecture
Expand Down

6 changes: 3 additions & 3 deletions
src/libraries/Native/Unix/configure.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,8 @@ include(CheckTypeSize)

if (CLR_CMAKE_TARGET_ANDROID)
 set(PAL_UNIX_NAME \"ANDROID\")
elseif (CLR_CMAKE_TARGET_ARCH_WASM)
 set(PAL_UNIX_NAME \"WEBASSEMBLY\")
elseif (CLR_CMAKE_TARGET_LINUX)
 set(PAL_UNIX_NAME \"LINUX\")
elseif (CLR_CMAKE_TARGET_OSX)
Expand All@@ -28,8 +30,6 @@ elseif (CLR_CMAKE_TARGET_FREEBSD)
 set(CMAKE_REQUIRED_INCLUDES ${CROSS_ROOTFS}/usr/local/include)
elseif (CLR_CMAKE_TARGET_NETBSD)
 set(PAL_UNIX_NAME \"NETBSD\")
elseif (CLR_CMAKE_TARGET_ARCH_WASM)
 set(PAL_UNIX_NAME \"WEBASSEMBLY\")
else ()
 message(FATAL_ERROR "Unknown platform. Cannot define PAL_UNIX_NAME, used by RuntimeInformation.")
endif ()
Expand DownExpand Up@@ -839,7 +839,7 @@ set (CMAKE_REQUIRED_LIBRARIES ${PREVIOUS_CMAKE_REQUIRED_LIBRARIES})
set (HAVE_INOTIFY 0)
if (HAVE_INOTIFY_INIT AND HAVE_INOTIFY_ADD_WATCH AND HAVE_INOTIFY_RM_WATCH)
 set (HAVE_INOTIFY 1)
elseif (CLR_CMAKE_TARGET_LINUX)
elseif (CLR_CMAKE_TARGET_LINUX AND NOT CLR_CMAKE_TARGET_ARCH_WASM)
 message(FATAL_ERROR "Cannot find inotify functions on a Linux platform.")
endif()

Expand Down

5 changes: 4 additions & 1 deletion
src/libraries/Native/build-native.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,10 +49,13 @@ source "$__RepoRootDir"/eng/native/build-commons.sh

if [[ "$__BuildArch" == wasm ]]; then
 if [[ -z "$EMSDK_PATH" ]]; then
 echo "Error: Should set EMSDK_PATH environment variable pointing to emsdk root."
 echo "Error: You need to set the EMSDK_PATH environment variable pointing to the emscripten SDK root."
 exit 1
 fi
 source "$EMSDK_PATH"/emsdk_env.sh

 export CLR_CC=$(which emcc)
 export CLR_CXX=$(which em++)

Comment on lines

+57
 to 
+58

@am11am11Apr 13, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A nit, typically posix-y command -v is preferred over which in this repo. (same goes for which false below)
@akoeplingerakoeplingerApr 14, 2020•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@am11 I tried that but it didn't work since we expect the full path in CLR_CC and command -v doesn't do that (for false at least)
elif [[ "$__TargetOS" == iOS ]]; then
 # nothing to do here
 true
Expand Down

3 changes: 2 additions & 1 deletion
src/mono/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,8 +42,9 @@
 <TargetsiOSSimulator Condition="'$(TargetsiOS)' == 'true' and '$(Platform)' == 'x64'">true</TargetsiOSSimulator>
 <TargetstvOSSimulator Condition="'$(TargetstvOS)' == 'true' and '$(Platform)' == 'x64'">true</TargetstvOSSimulator>
 <TargetsAndroid Condition="'$(TargetOS)' == 'Android'">true</TargetsAndroid>
 <TargetsWASM Condition="'$(TargetOS)' == 'WebAssembly'">true</TargetsWASM>
 <TargetsWindows Condition="'$(TargetOS)' == 'Windows_NT'">true</TargetsWindows>
 <TargetsUnix Condition="'$(TargetsFreeBSD)' == 'true' or '$(TargetsLinux)' == 'true' or '$(TargetsNetBSD)' == 'true' or '$(TargetsOSX)' == 'true' or '$(TargetstvOS)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetsAndroid)' == 'true'">true</TargetsUnix>
 <TargetsUnix Condition="'$(TargetsFreeBSD)' == 'true' or '$(TargetsLinux)' == 'true' or '$(TargetsNetBSD)' == 'true' or '$(TargetsOSX)' == 'true' or '$(TargetstvOS)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetsAndroid)' == 'true' or '$(TargetsWASM)' == 'true'">true</TargetsUnix>
 </PropertyGroup>

 <PropertyGroup>
Expand Down
Loading