[Lldb-commits] [lldb] 3031fa8 - [lldb] Fix building standalone LLDB on Windows.

[Martin Storsjö via lldb-commits]

Author: Mehdi Chinoune
Date: 2022-04-07T12:30:33+03:00
New Revision: 3031fa88f01e59dcacb0a3020fb9a27ccf2b7615

URL: https://github.com/llvm/llvm-project/commit/3031fa88f01e59dcacb0a3020fb9a27ccf2b7615
DIFF: https://github.com/llvm/llvm-project/commit/3031fa88f01e59dcacb0a3020fb9a27ccf2b7615.diff

LOG: [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

Added: 
    

Modified: 
    lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp
    llvm/include/llvm/Config/config.h.cmake
    llvm/include/llvm/Config/llvm-config.h.cmake

Removed: 
    


################################################################################
diff  --git a/lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp b/lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp
index 16a8ad8a10422..130353dfc67a6 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 2098c249e20db..cc514b17f8f0e 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 <dlfcn.h> 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 f15eef3a4dea9..7d420bbc71645 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