diff options
| author | Peter Marcu <Peter.Marcu@Microsoft.com> | 2016-12-18 18:32:05 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-18 18:32:05 -0800 |
| commit | 23407d10bf5c080d2ff9461b52c6c777484bf0c6 (patch) | |
| tree | 2c0fcf18f9785ce2e65b053eb4a014dab66b67fd /CMakeLists.txt | |
| parent | e50b22b4f07b452b3ce7261fb543a43aa8f70b88 (diff) | |
| download | coreclr-23407d10bf5c080d2ff9461b52c6c777484bf0c6.tar.gz coreclr-23407d10bf5c080d2ff9461b52c6c777484bf0c6.tar.bz2 coreclr-23407d10bf5c080d2ff9461b52c6c777484bf0c6.zip | |
Fixing up the arm subsystem versions (#8676)
* Adding arm64 and updating default subsystems
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 395f602492..61c689b6d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -315,10 +315,13 @@ if (WIN32) # # Disable the following line for UNIX altjit on Windows set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /MANIFEST:NO") #Do not create Side-by-Side Assembly Manifest - if (CLR_CMAKE_HOST_ARCH STREQUAL arm) - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS,6.02") #windows subsystem - arm minimum is 6.02 + + if (CLR_CMAKE_PLATFORM_ARCH_ARM) + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS,6.02") #windows subsystem - arm minimum is 6.02 + elseif(CLR_CMAKE_PLATFORM_ARCH_ARM64) + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS,6.03") #windows subsystem - arm64 minimum is 6.03 else () - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS,6.00") #windows subsystem + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS,6.01") #windows subsystem endif () set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /LARGEADDRESSAWARE") # can handle addresses larger than 2 gigabytes |