[lldb] Fix layering violation between Host & Platform on the Swift fork

Author: JDevlieghere

lldb/source/Host/macosx/objcxx/CMakeLists.txt

@@ -1,18 +1,10 @@
 set(SWIFT_SOURCES HostInfoMacOSXSwift.cpp)
 set(LLVM_OPTIONAL_SOURCES ${SWIFT_SOURCES})
-if (NOT LLDB_ENABLE_SWIFT_SUPPORT)
-  unset(SWIFT_SOURCES)
-  set(PLUGIN_DEPENDENCY_ARG NO_PLUGIN_DEPENDENCIES)
-  set(LLDB_PLUGIN_DEPENDENCIES)
-else()
-  set(PLUGIN_DEPENDENCY_ARG)
-  set(LLDB_PLUGIN_DEPENDENCIES lldbPluginPlatformMacOSX)
-endif()
 
 remove_module_flags()
 include_directories(..)
 
-add_lldb_library(lldbHostMacOSXObjCXX ${PLUGIN_DEPENDENCY_ARG}
+add_lldb_library(lldbHostMacOSXObjCXX NO_PLUGIN_DEPENDENCIES
   Host.mm
   HostInfoMacOSX.mm
   HostThreadMacOSX.mm
@@ -21,7 +13,6 @@ add_lldb_library(lldbHostMacOSXObjCXX ${PLUGIN_DEPENDENCY_ARG}
 
   LINK_LIBS
     lldbUtility
-    ${LLDB_PLUGIN_DEPENDENCIES}
     ${EXTRA_LIBS}
 
   LINK_COMPONENTS

lldb/source/Host/macosx/objcxx/HostInfoMacOSXSwift.cpp

@@ -285,8 +285,8 @@ HostInfoMacOSX::GetSwiftResourceDir(llvm::Triple triple,
       platform_sdk_path, swift_stdlib_os_dir,
       HostInfo::GetSwiftResourceDir().GetPath(),
       HostInfo::GetXcodeContentsDirectory().GetPath(),
-      PlatformDarwin::GetCurrentToolchainDirectory().GetPath(),
-      PlatformDarwin::GetCurrentCommandLineToolsDirectory().GetPath());
+      HostInfoMacOSX::GetCurrentXcodeToolchainDirectory().GetPath(),
+      HostInfoMacOSX::GetCurrentCommandLineToolsDirectory().GetPath());
   g_resource_dir_cache.insert({key, value});
   return g_resource_dir_cache[key];
 }