summaryrefslogtreecommitdiffstats
path: root/llvm
diff options
context:
space:
mode:
authorZachary Turner <zturner@google.com>2015-02-22 07:13:52 +0000
committerZachary Turner <zturner@google.com>2015-02-22 07:13:52 +0000
commit3ddf94ef6be8bccede6b25aa9cd1dc508b8765cd (patch)
treea268a71b8beaeff0f037172c9f2612455bff3727 /llvm
parentba229eb5ef01a5a33576782f944f459bc7408bfb (diff)
downloadbcm5719-llvm-3ddf94ef6be8bccede6b25aa9cd1dc508b8765cd.tar.gz
bcm5719-llvm-3ddf94ef6be8bccede6b25aa9cd1dc508b8765cd.zip
Really fix the build this time.
I was setting the python variable to "@HAVE_DIA_SDK@", which will always be a string, and will always evaluate to True. llvm-svn: 230163
Diffstat (limited to 'llvm')
-rwxr-xr-xllvm/cmake/config-ix.cmake2
-rw-r--r--llvm/test/lit.site.cfg.in2
2 files changed, 3 insertions, 1 deletions
diff --git a/llvm/cmake/config-ix.cmake b/llvm/cmake/config-ix.cmake
index 337a5a7da8f..fe1d6c9755e 100755
--- a/llvm/cmake/config-ix.cmake
+++ b/llvm/cmake/config-ix.cmake
@@ -446,6 +446,8 @@ if( MSVC )
else()
set(HAVE_DIA_SDK 0)
endif()
+else()
+ set(HAVE_DIA_SDK 0)
endif( MSVC )
message("CMake set HAVE_DIA_SDK to ${HAVE_DIA_SDK}")
diff --git a/llvm/test/lit.site.cfg.in b/llvm/test/lit.site.cfg.in
index 98544289d42..63df27d61b8 100644
--- a/llvm/test/lit.site.cfg.in
+++ b/llvm/test/lit.site.cfg.in
@@ -31,7 +31,7 @@ config.host_ldflags = "@HOST_LDFLAGS@"
config.llvm_use_intel_jitevents = "@LLVM_USE_INTEL_JITEVENTS@"
config.llvm_use_sanitizer = "@LLVM_USE_SANITIZER@"
config.have_zlib = "@HAVE_LIBZ@"
-config.have_dia_sdk = "@HAVE_DIA_SDK@"
+config.have_dia_sdk = @HAVE_DIA_SDK@
config.enable_ffi = "@LLVM_ENABLE_FFI@"
print("lit.site.cfg.in: config.have_dia_sdk set to %s" % config.have_dia_sdk)
OpenPOWER on IntegriCloud