maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "Set a different var for checking I686, because LLVM_NATIVE_ARCH is" 

This reverts commit 38a6db6397364ee91b04afea2cdcb1b5b4d252bf.

llvm-svn: 309179
This commit is contained in:
Eric Beckmann 2017-07-26 21:11:07 +00:00
parent a126a13bb3
commit ac84c74795
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
llvm/cmake/config-ix.cmake
View File

@ -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) find_library(ICONV_LIBRARY_PATH NAMES iconv libiconv libiconv-2 c)
set(LLVM_LIBXML2_ENABLED 0) set(LLVM_LIBXML2_ENABLED 0)
set(LIBXML2_FOUND 0) set(LIBXML2_FOUND 0)
if((LLVM_ENABLE_LIBXML2) AND (CMAKE_SYSTEM_NAME MATCHES "Linux") AND (ICONV_LIBRARY_PATH) AND (NOT LLVM_ARCH_I686)) if((LLVM_ENABLE_LIBXML2) AND (CMAKE_SYSTEM_NAME MATCHES "Linux") AND (ICONV_LIBRARY_PATH) AND (NOT LLVM_NATIVE_ARCH MATCHES "i686"))
find_package(LibXml2) find_package(LibXml2)
if (LIBXML2_FOUND) if (LIBXML2_FOUND)
set(LLVM_LIBXML2_ENABLED 1) set(LLVM_LIBXML2_ENABLED 1)
@ -383,10 +383,6 @@ if( LLVM_NATIVE_ARCH STREQUAL "host" )
string(REGEX MATCH "^[^-]*" LLVM_NATIVE_ARCH ${LLVM_HOST_TRIPLE}) string(REGEX MATCH "^[^-]*" LLVM_NATIVE_ARCH ${LLVM_HOST_TRIPLE})
endif () 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") if (LLVM_NATIVE_ARCH MATCHES "i[2-6]86")
set(LLVM_NATIVE_ARCH X86) set(LLVM_NATIVE_ARCH X86)
elseif (LLVM_NATIVE_ARCH STREQUAL "x86") elseif (LLVM_NATIVE_ARCH STREQUAL "x86")