diff options
| -rw-r--r-- | CMakeLists.txt | 11 | ||||
| -rwxr-xr-x | cmake/config-ix.cmake | 7 |
2 files changed, 7 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a3aee58d8d..ed230aee5b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -116,15 +116,8 @@ option(LLVM_ENABLE_FFI "Use libffi to call external functions from the interpret set(FFI_LIBRARY_DIR "" CACHE PATH "Additional directory, where CMake should search for libffi.so") set(FFI_INCLUDE_DIR "" CACHE PATH "Additional directory, where CMake should search for ffi.h or ffi/ffi.h") -set(LLVM_TARGET_ARCH "host" CACHE STRING - "Set target to use for LLVM JIT or use \"host\" for automatic detection.") - -# By default, we target the host, but this can be overridden at CMake -# invocation time. -set(LLVM_DEFAULT_TARGET_TRIPLE "${LLVM_TARGET_ARCH}" CACHE STRING - "Default target for which LLVM will generate code." ) -set(TARGET_TRIPLE "${LLVM_DEFAULT_TARGET_TRIPLE}" CACHE STRING - "Default target for which LLVM will generate code." ) +set(LLVM_TARGET_ARCH "host" + CACHE STRING "Set target to use for LLVM JIT or use \"host\" for automatic detection.") option(LLVM_ENABLE_THREADS "Use threads if available." ON) diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake index 1fe009fb07..25d6211ac6 100755 --- a/cmake/config-ix.cmake +++ b/cmake/config-ix.cmake @@ -291,7 +291,12 @@ check_cxx_compiler_flag("-Wno-variadic-macros" SUPPORTS_NO_VARIADIC_MACROS_FLAG) include(GetHostTriple) get_host_triple(LLVM_HOST_TRIPLE) + +# By default, we target the host, but this can be overridden at CMake +# invocation time. +set(LLVM_DEFAULT_TARGET_TRIPLE "${LLVM_HOST_TRIPLE}") set(LLVM_HOSTTRIPLE "${LLVM_HOST_TRIPLE}") +set(TARGET_TRIPLE "${LLVM_DEFAULT_TARGET_TRIPLE}") # Determine the native architecture. string(TOLOWER "${LLVM_TARGET_ARCH}" LLVM_NATIVE_ARCH) @@ -319,8 +324,6 @@ elseif (LLVM_NATIVE_ARCH MATCHES "xcore") set(LLVM_NATIVE_ARCH XCore) elseif (LLVM_NATIVE_ARCH MATCHES "msp430") set(LLVM_NATIVE_ARCH MSP430) -elseif (LLVM_NATIVE_ARCH MATCHES "hexagon") - set(LLVM_NATIVE_ARCH Hexagon) else () message(FATAL_ERROR "Unknown architecture ${LLVM_NATIVE_ARCH}") endif () |