diff options
| author | Petr Bred <bredpetr@gmail.com> | 2017-12-13 01:53:22 +0300 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2017-12-13 01:53:22 +0300 |
| commit | 9580df71726a1214f039eba97f637125e8ddcfdf (patch) | |
| tree | c9e8c3f6983f431c6fdb868e306e97c22306b0ba /src/Native/CMakeLists.txt | |
| parent | 36d1ccfb9f7dad06c7ecba13815e3b35cd6557f7 (diff) | |
Integration into build process (#5091)
- now it downloads llvm 5 release and uses it in the building ObjWriter
- add [objwriter] option into build.sh
- only Linux platform support
- cross building support(x86/x64 -> ARM32)
- LLVM is built in Release build type always,
ObjWriter uses global project build type.
Signed-off-by: Petr Bred <bredpetr@gmail.com>
Diffstat (limited to 'src/Native/CMakeLists.txt')
| -rw-r--r-- | src/Native/CMakeLists.txt | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/Native/CMakeLists.txt b/src/Native/CMakeLists.txt index e77b1b6f4..fafb0a644 100644 --- a/src/Native/CMakeLists.txt +++ b/src/Native/CMakeLists.txt @@ -62,9 +62,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL Linux) set(CLR_CMAKE_PLATFORM_UNIX 1) if(CLR_CMAKE_TARGET_ARCH STREQUAL x64) set(CLR_CMAKE_PLATFORM_UNIX_TARGET_AMD64 1) - elseif(CLR_CMAKE_TARGET_ARCH STREQUAL arm) - set(CLR_CMAKE_PLATFORM_UNIX_TARGET_ARM 1) - elseif(CLR_CMAKE_TARGET_ARCH STREQUAL armel) + elseif(CLR_CMAKE_TARGET_ARCH MATCHES "^(arm|armel)$") set(CLR_CMAKE_PLATFORM_UNIX_TARGET_ARM 1) elseif(CLR_CMAKE_TARGET_ARCH STREQUAL arm64) set(CLR_CMAKE_PLATFORM_UNIX_TARGET_ARM64 1) @@ -265,3 +263,8 @@ endif(NOT CLR_CMAKE_PLATFORM_WASM) if(NOT WIN32) add_subdirectory(System.Private.CoreLib.Native) endif(NOT WIN32) + +# Build ObjWriter on Linux only +if(CMAKE_SYSTEM_NAME STREQUAL Linux AND OBJWRITER_BUILD) + add_subdirectory(ObjWriter/llvmCap) +endif() |