diff options
| author | Eric Beckmann <ecbeckmann@google.com> | 2017-07-26 21:20:24 +0000 |
|---|---|---|
| committer | Eric Beckmann <ecbeckmann@google.com> | 2017-07-26 21:20:24 +0000 |
| commit | 4e19ea6aa7593fd35d6997c93c5ab189948e6da7 (patch) | |
| tree | 1113dbfffcc923441c20e64fc31a0966f8d45985 /cmake | |
| parent | ea5f088f7890bd852189abf8f42a16f23a79ef73 (diff) | |
Close if statement in config-ix.cmake while checking for i686 arch.
Reapply "Set a different var for checking I686, because LLVM_NATIVE_ARCH is"
This reverts commit e7400d7cbc2b7539de3aa7a20adc8f4ee0cb7bef.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@309181 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/config-ix.cmake | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake index dc03e44b995..b4dee3b51de 100644 --- a/cmake/config-ix.cmake +++ b/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,11 @@ 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) +endif() + if (LLVM_NATIVE_ARCH MATCHES "i[2-6]86") set(LLVM_NATIVE_ARCH X86) elseif (LLVM_NATIVE_ARCH STREQUAL "x86") |