zturner created this revision.
zturner added reviewers: labath, jgorbe, JDevlieghere, davide.
Herald added subscribers: mgorny, emaste.
`Host/Config.h` is where we have platform specific preprocessor defines that
are configured at CMake time. Then, we can include this file
`lldb/Host/Config.h` and read the value of defines. This is basically
identical to what llvm does with `llvm/Support/llvm-config.h`, the only
fundamental differences being: a) LLDB configures it into `lldb/Host` where as
the spiritual equivalent to `llvm/Support` is `lldb/Utility`, and b) LLDB calls
it `Config.h` and LLVM calls it `llvm-config.h`.
This patch brings LLDB in line with LLVM here by configuring into
`lldb/Utility/lldb-config.h`, in part for consistency and in part for more
practical reasons.
The practical reasons are that I want to use `Socket.h` from a new tool /
library without having to link all of LLDB such as Clang, Python, etc, and
that's not currently possible with the current layering, as linking to Host
will link to everything.
So this is a necessary first step. `llvm/Support`'s model for handling
platform specific differences is quite convenient both from a usability as well
as a maintenance perspective, and I'd like to gradually move towards that
whenever an opportunity / need arises. So the immediate plan is to move
`config.h` to Utility, and then start by moving pieces -- as necessary -- from
Host to Utility until I can get `Socket` just by linking to `lldbUtility`.
https://reviews.llvm.org/D58654
Files:
lldb/cmake/XcodeHeaderGenerator/CMakeLists.txt
lldb/cmake/modules/LLDBGenerateConfig.cmake
lldb/include/lldb/Host/Config.h
lldb/include/lldb/Host/Config.h.cmake
lldb/include/lldb/Host/MainLoop.h
lldb/include/lldb/Host/Terminal.h
lldb/include/lldb/Host/linux/Uio.h
lldb/include/lldb/Target/Process.h
lldb/include/lldb/Utility/lldb-config.h
lldb/include/lldb/Utility/lldb-config.h.cmake
lldb/source/Host/common/File.cpp
lldb/source/Host/common/HostInfoBase.cpp
lldb/source/Host/common/ProcessLaunchInfo.cpp
lldb/source/Host/common/PseudoTerminal.cpp
lldb/source/Host/common/Socket.cpp
lldb/source/Host/common/TCPSocket.cpp
lldb/source/Host/common/Terminal.cpp
lldb/source/Host/common/UDPSocket.cpp
lldb/source/Host/linux/HostInfoLinux.cpp
lldb/source/Host/posix/ConnectionFileDescriptorPosix.cpp
lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.cpp
lldb/source/Plugins/Platform/Kalimba/PlatformKalimba.cpp
lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp
lldb/source/Plugins/Platform/MacOSX/PlatformMacOSX.cpp
lldb/source/Plugins/Platform/NetBSD/PlatformNetBSD.cpp
lldb/source/Plugins/Platform/OpenBSD/PlatformOpenBSD.cpp
lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp
lldb/source/Plugins/Process/Utility/InferiorCallPOSIX.cpp
lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.h
lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationReplayServer.cpp
lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp
lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerCommon.cpp
lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp
lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.cpp
lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
lldb/unittests/Host/SocketTest.cpp
Index: lldb/unittests/Host/SocketTest.cpp
===================================================================
--- lldb/unittests/Host/SocketTest.cpp
+++ lldb/unittests/Host/SocketTest.cpp
@@ -12,10 +12,10 @@
#include "gtest/gtest.h"
-#include "lldb/Host/Config.h"
#include "lldb/Host/Socket.h"
#include "lldb/Host/common/TCPSocket.h"
#include "lldb/Host/common/UDPSocket.h"
+#include "lldb/Utility/lldb-config.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/Path.h"
Index: lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
===================================================================
--- lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
+++ lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "lldb/Host/Config.h"
+#include "lldb/Utility/lldb-config.h"
#include <errno.h>
#include <stdlib.h>
Index: lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.cpp
===================================================================
--- lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.cpp
+++ lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.cpp
@@ -19,7 +19,6 @@
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/Threading.h"
-#include "lldb/Host/Config.h"
#include "lldb/Host/ConnectionFileDescriptor.h"
#include "lldb/Host/FileAction.h"
#include "lldb/Host/Host.h"
@@ -33,6 +32,7 @@
#include "lldb/Utility/StreamString.h"
#include "lldb/Utility/StructuredData.h"
#include "lldb/Utility/UriParser.h"
+#include "lldb/Utility/lldb-config.h"
#include "lldb/Utility/StringExtractorGDBRemote.h"
Index: lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp
===================================================================
--- lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp
+++ lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp
@@ -8,7 +8,7 @@
#include <errno.h>
-#include "lldb/Host/Config.h"
+#include "lldb/Utility/lldb-config.h"
#include "GDBRemoteCommunicationServerLLGS.h"
#include "lldb/Utility/StreamGDBRemote.h"
Index: lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerCommon.cpp
===================================================================
--- lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerCommon.cpp
+++ lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerCommon.cpp
@@ -18,7 +18,6 @@
#include <cstring>
#include "lldb/Core/ModuleSpec.h"
-#include "lldb/Host/Config.h"
#include "lldb/Host/File.h"
#include "lldb/Host/FileAction.h"
#include "lldb/Host/FileSystem.h"
@@ -34,6 +33,7 @@
#include "lldb/Utility/Log.h"
#include "lldb/Utility/StreamGDBRemote.h"
#include "lldb/Utility/StreamString.h"
+#include "lldb/Utility/lldb-config.h"
#include "llvm/ADT/Triple.h"
#include "ProcessGDBRemoteLog.h"
Index: lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp
===================================================================
--- lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp
+++ lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp
@@ -8,7 +8,7 @@
#include <errno.h>
-#include "lldb/Host/Config.h"
+#include "lldb/Utility/lldb-config.h"
#include "GDBRemoteCommunicationServer.h"
Index: lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationReplayServer.cpp
===================================================================
--- lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationReplayServer.cpp
+++ lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationReplayServer.cpp
@@ -8,7 +8,7 @@
#include <errno.h>
-#include "lldb/Host/Config.h"
+#include "lldb/Utility/lldb-config.h"
#include "GDBRemoteCommunicationReplayServer.h"
#include "ProcessGDBRemoteLog.h"
Index: lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
===================================================================
--- lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
+++ lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
@@ -32,7 +32,7 @@
#include "ProcessGDBRemote.h"
#include "ProcessGDBRemoteLog.h"
#include "lldb/Host/Config.h"
-#include "lldb/Utility/StringExtractorGDBRemote.h"
+#include "lldb/Utility/lldb-config.h"
#include "llvm/ADT/StringSwitch.h"
Index: lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.h
===================================================================
--- lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.h
+++ lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.h
@@ -18,12 +18,12 @@
#include <vector>
#include "lldb/Core/Communication.h"
-#include "lldb/Host/Config.h"
#include "lldb/Host/HostThread.h"
#include "lldb/Utility/Args.h"
#include "lldb/Utility/Listener.h"
#include "lldb/Utility/Predicate.h"
#include "lldb/Utility/StringExtractorGDBRemote.h"
+#include "lldb/Utility/lldb-config.h"
#include "lldb/lldb-public.h"
namespace lldb_private {
Index: lldb/source/Plugins/Process/Utility/InferiorCallPOSIX.cpp
===================================================================
--- lldb/source/Plugins/Process/Utility/InferiorCallPOSIX.cpp
+++ lldb/source/Plugins/Process/Utility/InferiorCallPOSIX.cpp
@@ -11,7 +11,6 @@
#include "lldb/Core/StreamFile.h"
#include "lldb/Core/ValueObject.h"
#include "lldb/Expression/DiagnosticManager.h"
-#include "lldb/Host/Config.h"
#include "lldb/Symbol/ClangASTContext.h"
#include "lldb/Symbol/SymbolContext.h"
#include "lldb/Target/ExecutionContext.h"
@@ -19,6 +18,7 @@
#include "lldb/Target/Process.h"
#include "lldb/Target/Target.h"
#include "lldb/Target/ThreadPlanCallFunction.h"
+#include "lldb/Utility/lldb-config.h"
#ifndef LLDB_DISABLE_POSIX
#include <sys/mman.h>
Index: lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp
===================================================================
--- lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp
+++ lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "PlatformRemoteGDBServer.h"
-#include "lldb/Host/Config.h"
+#include "lldb/Utility/lldb-config.h"
#include "lldb/Breakpoint/BreakpointLocation.h"
#include "lldb/Core/Debugger.h"
Index: lldb/source/Plugins/Platform/OpenBSD/PlatformOpenBSD.cpp
===================================================================
--- lldb/source/Plugins/Platform/OpenBSD/PlatformOpenBSD.cpp
+++ lldb/source/Plugins/Platform/OpenBSD/PlatformOpenBSD.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "PlatformOpenBSD.h"
-#include "lldb/Host/Config.h"
+#include "lldb/Utility/lldb-config.h"
#include <stdio.h>
#ifndef LLDB_DISABLE_POSIX
Index: lldb/source/Plugins/Platform/NetBSD/PlatformNetBSD.cpp
===================================================================
--- lldb/source/Plugins/Platform/NetBSD/PlatformNetBSD.cpp
+++ lldb/source/Plugins/Platform/NetBSD/PlatformNetBSD.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "PlatformNetBSD.h"
-#include "lldb/Host/Config.h"
+#include "lldb/Utility/lldb-config.h"
#include <stdio.h>
#ifndef LLDB_DISABLE_POSIX
Index: lldb/source/Plugins/Platform/MacOSX/PlatformMacOSX.cpp
===================================================================
--- lldb/source/Plugins/Platform/MacOSX/PlatformMacOSX.cpp
+++ lldb/source/Plugins/Platform/MacOSX/PlatformMacOSX.cpp
@@ -7,8 +7,7 @@
//===----------------------------------------------------------------------===//
#include "PlatformMacOSX.h"
-#include "lldb/Host/Config.h"
-
+#include "lldb/Utility/lldb-config.h"
#include <sstream>
Index: lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp
===================================================================
--- lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp
+++ lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "PlatformLinux.h"
-#include "lldb/Host/Config.h"
+#include "lldb/Utility/lldb-config.h"
#include <stdio.h>
#ifndef LLDB_DISABLE_POSIX
Index: lldb/source/Plugins/Platform/Kalimba/PlatformKalimba.cpp
===================================================================
--- lldb/source/Plugins/Platform/Kalimba/PlatformKalimba.cpp
+++ lldb/source/Plugins/Platform/Kalimba/PlatformKalimba.cpp
@@ -8,7 +8,7 @@
//===----------------------------------------------------------------------===//
#include "PlatformKalimba.h"
-#include "lldb/Host/Config.h"
+#include "lldb/Utility/lldb-config.h"
#include "lldb/Core/Debugger.h"
#include "lldb/Core/Module.h"
Index: lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.cpp
===================================================================
--- lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.cpp
+++ lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "PlatformFreeBSD.h"
-#include "lldb/Host/Config.h"
+#include "lldb/Utility/lldb-config.h"
#include <stdio.h>
#ifndef LLDB_DISABLE_POSIX
Index: lldb/source/Host/posix/ConnectionFileDescriptorPosix.cpp
===================================================================
--- lldb/source/Host/posix/ConnectionFileDescriptorPosix.cpp
+++ lldb/source/Host/posix/ConnectionFileDescriptorPosix.cpp
@@ -14,11 +14,11 @@
#endif
#include "lldb/Host/posix/ConnectionFileDescriptorPosix.h"
-#include "lldb/Host/Config.h"
#include "lldb/Host/Socket.h"
#include "lldb/Host/SocketAddress.h"
#include "lldb/Utility/SelectHelper.h"
#include "lldb/Utility/Timeout.h"
+#include "lldb/Utility/lldb-config.h"
#include <errno.h>
#include <fcntl.h>
Index: lldb/source/Host/linux/HostInfoLinux.cpp
===================================================================
--- lldb/source/Host/linux/HostInfoLinux.cpp
+++ lldb/source/Host/linux/HostInfoLinux.cpp
@@ -7,9 +7,9 @@
//===----------------------------------------------------------------------===//
#include "lldb/Host/linux/HostInfoLinux.h"
-#include "lldb/Host/Config.h"
#include "lldb/Host/FileSystem.h"
#include "lldb/Utility/Log.h"
+#include "lldb/Utility/lldb-config.h"
#include "llvm/Support/Threading.h"
Index: lldb/source/Host/common/UDPSocket.cpp
===================================================================
--- lldb/source/Host/common/UDPSocket.cpp
+++ lldb/source/Host/common/UDPSocket.cpp
@@ -8,8 +8,8 @@
#include "lldb/Host/common/UDPSocket.h"
-#include "lldb/Host/Config.h"
#include "lldb/Utility/Log.h"
+#include "lldb/Utility/lldb-config.h"
#ifndef LLDB_DISABLE_POSIX
#include <arpa/inet.h>
Index: lldb/source/Host/common/Terminal.cpp
===================================================================
--- lldb/source/Host/common/Terminal.cpp
+++ lldb/source/Host/common/Terminal.cpp
@@ -8,8 +8,8 @@
#include "lldb/Host/Terminal.h"
-#include "lldb/Host/Config.h"
#include "lldb/Host/PosixApi.h"
+#include "lldb/Utility/lldb-config.h"
#include "llvm/ADT/STLExtras.h"
#include <fcntl.h>
Index: lldb/source/Host/common/TCPSocket.cpp
===================================================================
--- lldb/source/Host/common/TCPSocket.cpp
+++ lldb/source/Host/common/TCPSocket.cpp
@@ -12,9 +12,9 @@
#include "lldb/Host/common/TCPSocket.h"
-#include "lldb/Host/Config.h"
#include "lldb/Host/MainLoop.h"
#include "lldb/Utility/Log.h"
+#include "lldb/Utility/lldb-config.h"
#include "llvm/Config/llvm-config.h"
#include "llvm/Support/raw_ostream.h"
Index: lldb/source/Host/common/Socket.cpp
===================================================================
--- lldb/source/Host/common/Socket.cpp
+++ lldb/source/Host/common/Socket.cpp
@@ -8,7 +8,6 @@
#include "lldb/Host/Socket.h"
-#include "lldb/Host/Config.h"
#include "lldb/Host/Host.h"
#include "lldb/Host/SocketAddress.h"
#include "lldb/Host/StringConvert.h"
@@ -16,6 +15,7 @@
#include "lldb/Host/common/UDPSocket.h"
#include "lldb/Utility/Log.h"
#include "lldb/Utility/RegularExpression.h"
+#include "lldb/Utility/lldb-config.h"
#include "llvm/ADT/STLExtras.h"
Index: lldb/source/Host/common/PseudoTerminal.cpp
===================================================================
--- lldb/source/Host/common/PseudoTerminal.cpp
+++ lldb/source/Host/common/PseudoTerminal.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "lldb/Host/PseudoTerminal.h"
-#include "lldb/Host/Config.h"
+#include "lldb/Utility/lldb-config.h"
#include "llvm/Support/Errno.h"
Index: lldb/source/Host/common/ProcessLaunchInfo.cpp
===================================================================
--- lldb/source/Host/common/ProcessLaunchInfo.cpp
+++ lldb/source/Host/common/ProcessLaunchInfo.cpp
@@ -8,13 +8,13 @@
#include <climits>
-#include "lldb/Host/Config.h"
#include "lldb/Host/FileAction.h"
#include "lldb/Host/FileSystem.h"
#include "lldb/Host/HostInfo.h"
#include "lldb/Host/ProcessLaunchInfo.h"
#include "lldb/Utility/Log.h"
#include "lldb/Utility/StreamString.h"
+#include "lldb/Utility/lldb-config.h"
#include "llvm/Support/ConvertUTF.h"
#include "llvm/Support/FileSystem.h"
Index: lldb/source/Host/common/HostInfoBase.cpp
===================================================================
--- lldb/source/Host/common/HostInfoBase.cpp
+++ lldb/source/Host/common/HostInfoBase.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "lldb/Host/Config.h"
+#include "lldb/Utility/lldb-config.h"
#include "lldb/Host/FileSystem.h"
#include "lldb/Host/Host.h"
Index: lldb/source/Host/common/File.cpp
===================================================================
--- lldb/source/Host/common/File.cpp
+++ lldb/source/Host/common/File.cpp
@@ -28,12 +28,12 @@
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/Process.h"
-#include "lldb/Host/Config.h"
#include "lldb/Host/FileSystem.h"
#include "lldb/Host/Host.h"
#include "lldb/Utility/DataBufferHeap.h"
#include "lldb/Utility/FileSpec.h"
#include "lldb/Utility/Log.h"
+#include "lldb/Utility/lldb-config.h"
using namespace lldb;
using namespace lldb_private;
Index: lldb/include/lldb/Utility/lldb-config.h.cmake
===================================================================
--- lldb/include/lldb/Utility/lldb-config.h.cmake
+++ lldb/include/lldb/Utility/lldb-config.h.cmake
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLDB_HOST_CONFIG_H
-#define LLDB_HOST_CONFIG_H
+#ifndef LLDB_UTILITY_CONFIG_H
+#define LLDB_UTILITY_CONFIG_H
#cmakedefine LLDB_CONFIG_TERMIOS_SUPPORTED
@@ -33,4 +33,4 @@
#cmakedefine HAVE_LIBCOMPRESSION
#endif
-#endif // #ifndef LLDB_HOST_CONFIG_H
+#endif // #ifndef LLDB_UTILITY_CONFIG_H
Index: lldb/include/lldb/Utility/lldb-config.h
===================================================================
--- lldb/include/lldb/Utility/lldb-config.h
+++ lldb/include/lldb/Utility/lldb-config.h
@@ -6,9 +6,9 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLDB_HOST_CONFIG_H
-#define LLDB_HOST_CONFIG_H
-
+#ifndef LLDB_UTILITY_CONFIG_H
+#define LLDB_UTILITY_CONFIG_H
+
#if defined(__APPLE__)
// This block of code only exists to keep the Xcode project working in the
@@ -33,4 +33,4 @@
#endif
-#endif // #ifndef LLDB_HOST_CONFIG_H
+#endif // #ifndef LLDB_UTILITY_CONFIG_H
Index: lldb/include/lldb/Target/Process.h
===================================================================
--- lldb/include/lldb/Target/Process.h
+++ lldb/include/lldb/Target/Process.h
@@ -9,7 +9,7 @@
#ifndef liblldb_Process_h_
#define liblldb_Process_h_
-#include "lldb/Host/Config.h"
+#include "lldb/Utility/lldb-config.h"
#include <limits.h>
Index: lldb/include/lldb/Host/linux/Uio.h
===================================================================
--- lldb/include/lldb/Host/linux/Uio.h
+++ lldb/include/lldb/Host/linux/Uio.h
@@ -9,7 +9,7 @@
#ifndef liblldb_Host_linux_Uio_h_
#define liblldb_Host_linux_Uio_h_
-#include "lldb/Host/Config.h"
+#include "lldb/Utility/lldb-config.h"
#include <sys/uio.h>
// We shall provide our own implementation of process_vm_readv if it is not
Index: lldb/include/lldb/Host/Terminal.h
===================================================================
--- lldb/include/lldb/Host/Terminal.h
+++ lldb/include/lldb/Host/Terminal.h
@@ -10,7 +10,7 @@
#define liblldb_Terminal_h_
#if defined(__cplusplus)
-#include "lldb/Host/Config.h"
+#include "lldb/Utility/lldb-config.h"
#include "lldb/lldb-private.h"
struct termios;
Index: lldb/include/lldb/Host/MainLoop.h
===================================================================
--- lldb/include/lldb/Host/MainLoop.h
+++ lldb/include/lldb/Host/MainLoop.h
@@ -9,8 +9,8 @@
#ifndef lldb_Host_MainLoop_h_
#define lldb_Host_MainLoop_h_
-#include "lldb/Host/Config.h"
#include "lldb/Host/MainLoopBase.h"
+#include "lldb/Utility/lldb-config.h"
#include "llvm/ADT/DenseMap.h"
#include <csignal>
Index: lldb/cmake/modules/LLDBGenerateConfig.cmake
===================================================================
--- lldb/cmake/modules/LLDBGenerateConfig.cmake
+++ lldb/cmake/modules/LLDBGenerateConfig.cmake
@@ -47,11 +47,11 @@
endif()
if(NOT LLDB_CONFIG_HEADER_INPUT)
- set(LLDB_CONFIG_HEADER_INPUT ${LLDB_INCLUDE_ROOT}/lldb/Host/Config.h.cmake)
+ set(LLDB_CONFIG_HEADER_INPUT ${LLDB_INCLUDE_ROOT}/lldb/Utility/lldb-config.h.cmake)
endif()
if(NOT LLDB_CONFIG_HEADER_OUTPUT)
- set(LLDB_CONFIG_HEADER_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/include/lldb/Host/Config.h)
+ set(LLDB_CONFIG_HEADER_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/include/lldb/Utility/lldb-config.h)
endif()
# This should be done at the end
Index: lldb/cmake/XcodeHeaderGenerator/CMakeLists.txt
===================================================================
--- lldb/cmake/XcodeHeaderGenerator/CMakeLists.txt
+++ lldb/cmake/XcodeHeaderGenerator/CMakeLists.txt
@@ -9,6 +9,6 @@
)
set(LLDB_CONFIG_HEADER_INPUT
- ${CMAKE_CURRENT_SOURCE_DIR}/../../include/lldb/Host/Config.h.cmake)
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../include/lldb/Utility/lldb-config.h.cmake)
include(LLDBGenerateConfig)
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
