From 3031fa88f01e59dcacb0a3020fb9a27ccf2b7615 Mon Sep 17 00:00:00 2001 From: Mehdi Chinoune Date: Thu, 7 Apr 2022 12:11:52 +0300 Subject: [PATCH] [lldb] Fix building standalone LLDB on Windows. It was broken since https://reviews.llvm.org/D110172 Reviewed By: JDevlieghere Differential Revision: https://reviews.llvm.org/D122523 --- lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp | 2 +- llvm/include/llvm/Config/config.h.cmake | 3 --- llvm/include/llvm/Config/llvm-config.h.cmake | 3 +++ 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp b/lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp index 16a8ad8a1042..130353dfc67a 100644 --- a/lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp +++ b/lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp @@ -57,7 +57,7 @@ #include "Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.h" #if defined(_WIN32) -#include "llvm/Config/config.h" +#include "llvm/Config/llvm-config.h" #endif using namespace lldb; diff --git a/llvm/include/llvm/Config/config.h.cmake b/llvm/include/llvm/Config/config.h.cmake index 2098c249e20d..cc514b17f8f0 100644 --- a/llvm/include/llvm/Config/config.h.cmake +++ b/llvm/include/llvm/Config/config.h.cmake @@ -50,9 +50,6 @@ don't. */ #cmakedefine01 HAVE_DECL_STRERROR_S -/* Define to 1 if you have the DIA SDK installed, and to 0 if you don't. */ -#cmakedefine01 LLVM_ENABLE_DIA_SDK - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_DLFCN_H ${HAVE_DLFCN_H} diff --git a/llvm/include/llvm/Config/llvm-config.h.cmake b/llvm/include/llvm/Config/llvm-config.h.cmake index f15eef3a4dea..7d420bbc7164 100644 --- a/llvm/include/llvm/Config/llvm-config.h.cmake +++ b/llvm/include/llvm/Config/llvm-config.h.cmake @@ -113,4 +113,7 @@ * in non assert builds */ #cmakedefine01 LLVM_UNREACHABLE_OPTIMIZE +/* Define to 1 if you have the DIA SDK installed, and to 0 if you don't. */ +#cmakedefine01 LLVM_ENABLE_DIA_SDK + #endif