diff --git a/thirdparty/dill/dill/CMakeLists.txt b/thirdparty/dill/dill/CMakeLists.txt index 8d6bfe8b24..03202c9c1f 100644 --- a/thirdparty/dill/dill/CMakeLists.txt +++ b/thirdparty/dill/dill/CMakeLists.txt @@ -102,7 +102,7 @@ check_type_size("void*" CMAKE_SIZEOF_VOID_P) check_type_size("long" SIZEOF_LONG) set(NATIVE_CG TRUE) unset(NATIVE_ARCH) -if(CMAKE_SYSTEM_PROCESSOR MATCHES "i.86|x86_64|AMD64") +if(CMAKE_SYSTEM_PROCESSOR MATCHES "i.86|x86_64|AMD64|amd64") if(CMAKE_SIZEOF_VOID_P EQUAL 8) set(NATIVE_ARCH x86_64) set(HOST_X86_64 1) @@ -200,7 +200,7 @@ endif() if(LIBFFI_FOUND) message(STATUS "Enabling emulation") set(EMULATION_POSSIBLE TRUE) -elseif(DILL_IGNORE_NATIVE OR (NATIVE_ARCH STREQUAL "UNSUPPORTED")) +elseif((DILL_IGNORE_NATIVE OR (NATIVE_ARCH STREQUAL "UNSUPPORTED")) AND NOT DILL_NATIVE_ONLY) find_program (AUTOCONF autoconf) find_program (AUTOMAKE automake) if ((AUTOCONF STREQUAL "AUTOCONF-NOTFOUND") OR (AUTOMAKE STREQUAL "AUTOMAKE-NOTFOUND")) @@ -344,7 +344,6 @@ check_include_files(memory.h HAVE_MEMORY_H) check_include_files(sys/mman.h HAVE_SYS_MMAN_H) include(CheckSymbolExists) check_symbol_exists(__clear_cache "" CLEAR_CACHE_DEFINED) -message(STATUS "Clear cache defined is ${CLEAR_CACHE_DEFINED}") set(NO_DISASSEMBLER TRUE) if(DILL_ENABLE_DISASSEMBLY)