diff options
| author | Eric Beckmann <ecbeckmann@google.com> | 2017-07-26 21:03:55 +0000 |
|---|---|---|
| committer | Eric Beckmann <ecbeckmann@google.com> | 2017-07-26 21:03:55 +0000 |
| commit | 92d4dd0da711a977012f67718f1a3a311ad03c13 (patch) | |
| tree | a9af31d78c2c012f9ae95e18efec86e120691ea0 | |
| parent | dae1a15a79d2d474f5de1c03105d89ab9336f0cc (diff) | |
| download | bcm5719-llvm-92d4dd0da711a977012f67718f1a3a311ad03c13.tar.gz bcm5719-llvm-92d4dd0da711a977012f67718f1a3a311ad03c13.zip | |
Set a different var for checking I686, because LLVM_NATIVE_ARCH is
overwritten.
llvm-svn: 309177
| -rw-r--r-- | llvm/cmake/config-ix.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/llvm/cmake/config-ix.cmake b/llvm/cmake/config-ix.cmake index dc03e44b995..2d3b8663453 100644 --- a/llvm/cmake/config-ix.cmake +++ b/llvm/cmake/config-ix.cmake @@ -159,7 +159,7 @@ if( NOT PURE_WINDOWS AND NOT LLVM_USE_SANITIZER MATCHES "Memory.*") find_library(ICONV_LIBRARY_PATH NAMES iconv libiconv libiconv-2 c) set(LLVM_LIBXML2_ENABLED 0) set(LIBXML2_FOUND 0) - if((LLVM_ENABLE_LIBXML2) AND (CMAKE_SYSTEM_NAME MATCHES "Linux") AND (ICONV_LIBRARY_PATH) AND (NOT LLVM_NATIVE_ARCH MATCHES "i686")) + if((LLVM_ENABLE_LIBXML2) AND (CMAKE_SYSTEM_NAME MATCHES "Linux") AND (ICONV_LIBRARY_PATH) AND (NOT LLVM_ARCH_I686)) find_package(LibXml2) if (LIBXML2_FOUND) set(LLVM_LIBXML2_ENABLED 1) @@ -383,6 +383,10 @@ if( LLVM_NATIVE_ARCH STREQUAL "host" ) string(REGEX MATCH "^[^-]*" LLVM_NATIVE_ARCH ${LLVM_HOST_TRIPLE}) endif () +set(LLVM_ARCH_I686 0) +if (LLVM_NATIVE_ARCH MATCHES "i686") + set(LLVM_ARCH_I686 1) + if (LLVM_NATIVE_ARCH MATCHES "i[2-6]86") set(LLVM_NATIVE_ARCH X86) elseif (LLVM_NATIVE_ARCH STREQUAL "x86") |
