Really fix the build this time.
authorZachary Turner <zturner@google.com>
Sun, 22 Feb 2015 07:13:52 +0000 (07:13 +0000)
committerZachary Turner <zturner@google.com>
Sun, 22 Feb 2015 07:13:52 +0000 (07:13 +0000)
I was setting the python variable to "@HAVE_DIA_SDK@", which will
always be a string, and will always evaluate to True.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@230163 91177308-0d34-0410-b5e6-96231b3b80d8

cmake/config-ix.cmake
test/lit.site.cfg.in

index 337a5a7da8f73535f95a019125b398e5bdade427..fe1d6c9755edec962665a340e959e376db2bc4cf 100755 (executable)
@@ -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}")
index 98544289d42bf88022ec9050d29ab55bed58d9cf..63df27d61b87ed123d56e0d3e0bd1d5923bd2997 100644 (file)
@@ -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)