From 3ddf94ef6be8bccede6b25aa9cd1dc508b8765cd Mon Sep 17 00:00:00 2001 From: Zachary Turner Date: Sun, 22 Feb 2015 07:13:52 +0000 Subject: [PATCH] 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 --- llvm/cmake/config-ix.cmake | 2 ++ llvm/test/lit.site.cfg.in | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/llvm/cmake/config-ix.cmake b/llvm/cmake/config-ix.cmake index 337a5a7..fe1d6c9 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 9854428..63df27d 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) -- 2.7.4