summaryrefslogtreecommitdiffstats
path: root/llvm/tools/llvm-config
diff options
context:
space:
mode:
authorQuentin Colombet <qcolombet@apple.com>2016-07-21 17:26:47 +0000
committerQuentin Colombet <qcolombet@apple.com>2016-07-21 17:26:47 +0000
commita4bcc3f069861f85365bb9076629940cff8d018f (patch)
treeb5b1d84f7fced37a81670e9ee6d51bde20584698 /llvm/tools/llvm-config
parentc8df88c9b5de8ba52da02d8f68cc96a83eb09263 (diff)
downloadbcm5719-llvm-a4bcc3f069861f85365bb9076629940cff8d018f.tar.gz
bcm5719-llvm-a4bcc3f069861f85365bb9076629940cff8d018f.zip
[llvm-config][GlobalISel] Canonicalize LLVM_HAS_GLOBAL_ISEL on ON/OFF.
Previously LLVM_HAS_GLOBAL_ISEL would directly get the value of LLVM_BUILD_GLOBAL_ISEL. This could be any integer value and not just ON and OFF. The problem is that lit.cfg was checking for ON to define that global-isel was supported, thus if we were setting LLVM_BUILD_GLOBAL_ISEL with an integer value, say 1, this test would fail whereas we do build global-isel and want to test it. llvm-svn: 276307
Diffstat (limited to 'llvm/tools/llvm-config')
-rw-r--r--llvm/tools/llvm-config/CMakeLists.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/llvm/tools/llvm-config/CMakeLists.txt b/llvm/tools/llvm-config/CMakeLists.txt
index d45877135ba..744fa4e44d1 100644
--- a/llvm/tools/llvm-config/CMakeLists.txt
+++ b/llvm/tools/llvm-config/CMakeLists.txt
@@ -37,7 +37,11 @@ set(LLVM_CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_
set(LLVM_BUILD_SYSTEM cmake)
set(LLVM_HAS_RTTI ${LLVM_CONFIG_HAS_RTTI})
set(LLVM_DYLIB_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}${LLVM_VERSION_SUFFIX}")
-set(LLVM_HAS_GLOBAL_ISEL "${LLVM_BUILD_GLOBAL_ISEL}")
+if(LLVM_BUILD_GLOBAL_ISEL)
+ set(LLVM_HAS_GLOBAL_ISEL "ON")
+else()
+ set(LLVM_HAS_GLOBAL_ISEL "OFF")
+endif()
# Use the C++ link flags, since they should be a superset of C link flags.
set(LLVM_LDFLAGS "${CMAKE_CXX_LINK_FLAGS}")
OpenPOWER on IntegriCloud