diff options
| author | Morgan Brown <morganbr@users.noreply.github.com> | 2017-12-05 09:45:38 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-05 09:45:38 +0300 |
| commit | 3d25db5b1c010346bbc480a20646c80ea413492f (patch) | |
| tree | e49e79d7ef6cd6861dd54d6db5262dfce216e695 /src/Native/Runtime/CMakeLists.txt | |
| parent | c900f3d03df888df2271cc7e207cdc645ae94aa2 (diff) | |
Build runtime and libraries for WebAssembly (#4876)
* Fix issues building the runtime, corelib and type loader for WebAssembly
* Fix test infrastructure to allow running with the wasm flavor
Diffstat (limited to 'src/Native/Runtime/CMakeLists.txt')
| -rw-r--r-- | src/Native/Runtime/CMakeLists.txt | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/Native/Runtime/CMakeLists.txt b/src/Native/Runtime/CMakeLists.txt index 4a5593d5c..12fa1532d 100644 --- a/src/Native/Runtime/CMakeLists.txt +++ b/src/Native/Runtime/CMakeLists.txt @@ -100,7 +100,11 @@ if(WIN32) else() include_directories(unix) - include_directories(../libunwind/include) + if(NOT CLR_CMAKE_PLATFORM_ARCH_WASM) + include_directories(../libunwind/include) + else() + include_directories($ENV{EMSCRIPTEN/system/lib/libcxxabi/include}) + endif() # Disable building _Unwind_XXX style APIs of libunwind, since we don't use them. add_definitions(-D_LIBUNWIND_DISABLE_ZERO_COST_APIS=1) @@ -216,8 +220,8 @@ convert_to_absolute_path(PORTABLE_RUNTIME_SOURCES ${PORTABLE_RUNTIME_SOURCES}) convert_to_absolute_path(RUNTIME_SOURCES_ARCH_ASM ${RUNTIME_SOURCES_ARCH_ASM}) -if(NOT CLR_CMAKE_PLATFORM_WASM) +if(NOT CLR_CMAKE_PLATFORM_ARCH_WASM) add_subdirectory(Full) -endif(NOT CLR_CMAKE_PLATFORM_WASM) +endif() add_subdirectory(Portable) |