Skip to content
Snippets Groups Projects
Commit 82ad01c2 authored by Konstantin Osipov's avatar Konstantin Osipov
Browse files

Merge branch 'gh-52-OSX-always-detected-as-i386' into stable

parents b2a39e3c fd19d3eb
No related branches found
No related tags found
No related merge requests found
......@@ -14,3 +14,15 @@ if (${HAVE_BYTE_ORDER_BIG_ENDIAN} OR
message (FATAL_ERROR "Tarantool currently only supports little-endian hardware")
message (FATAL_ERROR "with unaligned word access.")
endif()
#
# Bug in CMake, Darwin always detect on i386
# Fixed with check types
#
if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
if (CMAKE_SIZEOF_VOID_P MATCHES 8)
set(CMAKE_SYSTEM_PROCESSOR "x86_64")
else(CMAKE_SIZEOF_VOID_P MATCHES 8)
set(CMAKE_SYSTEM_PROCESSOR "x86")
endif(CMAKE_SIZEOF_VOID_P MATCHES 8)
endif()
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment