diff options
| author | Peter Marcu <Peter.Marcu@Microsoft.com> | 2016-11-19 23:37:51 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-19 23:37:51 -0800 |
| commit | fc3607f054a595e2c1a2ddea1171cbadb39b0a3a (patch) | |
| tree | ce460cd41b171939557e9b70e08723d7a4c63008 /CMakeLists.txt | |
| parent | 198bdf53c0590bda08b9b8e1ede1270fc9a8afc1 (diff) | |
| download | coreclr-fc3607f054a595e2c1a2ddea1171cbadb39b0a3a.tar.gz coreclr-fc3607f054a595e2c1a2ddea1171cbadb39b0a3a.tar.bz2 coreclr-fc3607f054a595e2c1a2ddea1171cbadb39b0a3a.zip | |
Fixing arm subsystem version (#8211)
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2601220680..610f89b821 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -293,7 +293,12 @@ 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 - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS,6.00") #windows subsystem + 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 + else () + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS,6.00") #windows subsystem + endif () + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /LARGEADDRESSAWARE") # can handle addresses larger than 2 gigabytes set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /RELEASE") #sets the checksum in the header set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NXCOMPAT") #Compatible with Data Execution Prevention |