diff options
author | Jonathan Taylor <taylorjonl@gmail.com> | 2016-01-01 19:48:43 +0000 |
---|---|---|
committer | Jonathan Taylor <taylorjonl@gmail.com> | 2016-01-01 19:48:43 +0000 |
commit | 44ce49211382594729a6801c45ccea457ac6452d (patch) | |
tree | 9692e9f2f1d3781db6795baf1d7acbc70bf2981d | |
parent | 73a42611c2796a0f9d7e02a15ac7ec910061dc50 (diff) | |
download | coreclr-44ce49211382594729a6801c45ccea457ac6452d.tar.gz coreclr-44ce49211382594729a6801c45ccea457ac6452d.tar.bz2 coreclr-44ce49211382594729a6801c45ccea457ac6452d.zip |
Fixed issue where CMAKE couldn't identify SunOS processor type
-rw-r--r-- | CMakeLists.txt | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b70d0955ba..f3a0525a1c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,7 +69,16 @@ endif(CMAKE_SYSTEM_NAME STREQUAL NetBSD) if(CMAKE_SYSTEM_NAME STREQUAL SunOS) set(CLR_CMAKE_PLATFORM_UNIX 1) - set(CLR_CMAKE_PLATFORM_UNIX_TARGET_AMD64 1) + EXECUTE_PROCESS( + COMMAND isainfo -n + OUTPUT_VARIABLE SUNOS_NATIVE_INSTRUCTION_SET + ) + if(SUNOS_NATIVE_INSTRUCTION_SET MATCHES "amd64") + set(CLR_CMAKE_PLATFORM_UNIX_TARGET_AMD64 1) + set(CMAKE_SYSTEM_PROCESSOR "amd64") + else() + clr_unknown_arch() + endif() set(CLR_CMAKE_PLATFORM_SUNOS 1) endif(CMAKE_SYSTEM_NAME STREQUAL SunOS) |