diff options
| author | Alexander Blair <snipa@jagtech.io> | 2020-08-16 12:38:44 -0700 |
|---|---|---|
| committer | Alexander Blair <snipa@jagtech.io> | 2020-08-16 12:38:44 -0700 |
| commit | e2e09d00c27c804bbc3abc97d42a7e805d5bd0cd (patch) | |
| tree | a4961af082efd0be7e244c301af548604ed1932a /contrib | |
| parent | 13549d590e2e70364c5e591068fd451c32364d7d (diff) | |
| parent | a11ec4ac1d335677842b447208a9b45d531beeb0 (diff) | |
| download | monzero-core-e2e09d00c27c804bbc3abc97d42a7e805d5bd0cd.tar.gz monzero-core-e2e09d00c27c804bbc3abc97d42a7e805d5bd0cd.tar.xz monzero-core-e2e09d00c27c804bbc3abc97d42a7e805d5bd0cd.zip | |
Merge pull request #6337
a11ec4ac1 Support for supercop ASM in wallet, and benchmark for supercop (Lee Clagett)
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/depends/toolchain.cmake.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/contrib/depends/toolchain.cmake.in b/contrib/depends/toolchain.cmake.in index 2634423ab..422d9dede 100644 --- a/contrib/depends/toolchain.cmake.in +++ b/contrib/depends/toolchain.cmake.in @@ -1,5 +1,6 @@ # Set the system name to one of Android, Darwin, FreeBSD, Linux, or Windows SET(CMAKE_SYSTEM_NAME @depends@) +SET(CMAKE_SYSTEM_PROCESSOR @arch@) SET(CMAKE_BUILD_TYPE @release_type@) OPTION(STATIC "Link libraries statically" ON) @@ -63,14 +64,14 @@ set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) # Find programs on host set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) # Find libs in target set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) # Find includes in target -set(CMAKE_SYSTEM_PROCESSOR ${CMAKE_HOST_SYSTEM_PROCESSOR} CACHE STRING "" FORCE) - # specify the cross compiler to be used. Darwin uses clang provided by the SDK. if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") SET(CMAKE_C_COMPILER @prefix@/native/bin/clang) SET(CMAKE_C_COMPILER_TARGET x86_64-apple-darwin11) SET(CMAKE_CXX_COMPILER @prefix@/native/bin/clang++ -stdlib=libc++) SET(CMAKE_CXX_COMPILER_TARGET x86_64-apple-darwin11) + SET(CMAKE_ASM_COMPILER_TARGET x86_64-apple-darwin11) + SET(CMAKE_ASM-ATT_COMPILER_TARGET x86_64-apple-darwin11) SET(_CMAKE_TOOLCHAIN_PREFIX x86_64-apple-darwin11-) SET(APPLE True) SET(BUILD_TAG "mac-x64") |