diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-10-15 13:31:56 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-10-15 13:31:57 +0200 |
| commit | 7c6a7c1945214fc92269f300c750e366617dc271 (patch) | |
| tree | 2ccf0fbc7eeb5ea452df4a9ab1924cf39a3ea407 /contrib | |
| parent | Merge pull request #4577 (diff) | |
| parent | build: use ARCH 'native' by default, allow to configure and override it (diff) | |
| download | monero-7c6a7c1945214fc92269f300c750e366617dc271.tar.xz | |
Merge pull request #4565
bf842a6a build: use ARCH 'native' by default, allow to configure and override it (xiphon)
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/depends/toolchain.cmake.in | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/contrib/depends/toolchain.cmake.in b/contrib/depends/toolchain.cmake.in index f8548a724..66168facb 100644 --- a/contrib/depends/toolchain.cmake.in +++ b/contrib/depends/toolchain.cmake.in @@ -51,7 +51,9 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") SET(APPLE True) SET(BUILD_TAG "mac-x64") SET(BUILD_64 ON) + if(NOT TRAVIS) SET(ARCH "x86_64") + endif() SET(BREW OFF) SET(PORT OFF) SET(CMAKE_OSX_SYSROOT "@sdk@/MacOSX10.11.sdk/") |