From 7b968969db7dd5a5b9681cdbca0b6302a792dd6f Mon Sep 17 00:00:00 2001 From: Pavel Labath Date: Thu, 29 Nov 2018 10:45:41 +0000 Subject: [PATCH] Remove getopt includes from the driver They are not needed now that we use LLVMOption for command-line parsing thank you, Jonas). This also allows us to avoid linking of lldbHost into the driver which was breaking liblldb encapsulation. (Technically, there is still a lldb/Host/windows/windows.h include which is needed on windows, but this is a header-only wrapper for , so it is not necessary to link lldbHost for that. But ideally, that should go away too.) llvm-svn: 347846 --- lldb/tools/driver/CMakeLists.txt | 11 ----------- lldb/tools/driver/Platform.h | 2 -- 2 files changed, 13 deletions(-) diff --git a/lldb/tools/driver/CMakeLists.txt b/lldb/tools/driver/CMakeLists.txt index 6127fad604f9..4378c9d1918e 100644 --- a/lldb/tools/driver/CMakeLists.txt +++ b/lldb/tools/driver/CMakeLists.txt @@ -2,23 +2,12 @@ set(LLVM_TARGET_DEFINITIONS Options.td) tablegen(LLVM Options.inc -gen-opt-parser-defs) add_public_tablegen_target(LLDBOptionsTableGen) -if ((CMAKE_SYSTEM_NAME MATCHES "Windows") OR - (CMAKE_SYSTEM_NAME MATCHES "NetBSD" )) - # These targets do not have getopt support, so they rely on the one provided by - # liblldb. However, getopt is not a part of the liblldb interface, so we have - # to link against the constituent libraries manually. Note that this is - # extremely scary as it introduces ODR violations, and it should go away as - # soon as possible. - set(host_lib lldbHost) -endif() - add_lldb_tool(lldb Driver.cpp Platform.cpp LINK_LIBS liblldb - ${host_lib} LINK_COMPONENTS Option diff --git a/lldb/tools/driver/Platform.h b/lldb/tools/driver/Platform.h index 521c5a1ccbb5..25d5ae23b996 100644 --- a/lldb/tools/driver/Platform.h +++ b/lldb/tools/driver/Platform.h @@ -12,7 +12,6 @@ #if defined(_WIN32) -#include "lldb/Host/HostGetOpt.h" #include #if defined(_MSC_VER) #include @@ -74,7 +73,6 @@ extern int tcsetattr(int fd, int optional_actions, extern int tcgetattr(int fildes, struct termios *termios_p); #else -#include "lldb/Host/HostGetOpt.h" #include #include