[Lldb-commits] [lldb] r181717 - <rdar://problem/13875830>

[Greg Clayton]

Author: gclayton
Date: Mon May 13 13:22:55 2013
New Revision: 181717

URL: http://llvm.org/viewvc/llvm-project?rev=181717&view=rev
Log:
<rdar://problem/13875830>

Unblock linux builds. The real fix for this is tracked by the above radar, but this temporary hack should fix things for now.


Modified:
    lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp
    lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.h

Modified: lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp?rev=181717&r1=181716&r2=181717&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp (original)
+++ lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp Mon May 13 13:22:55 2013
@@ -653,4 +653,22 @@ PlatformDarwinKernel::GetSupportedArchit
 #endif
 }
 
+#else  // __APPLE__
+
+// Since DynamicLoaderDarwinKernel is compiled in for all systems, and relies on
+// PlatformDarwinKernel for the plug-in name, we compile just the plug-in name in
+// here to avoid issues. We are tracking an internal bug to resolve this issue by
+// either not compiling in DynamicLoaderDarwinKernel for non-apple builds, or to make
+// PlatformDarwinKernel build on all systems. PlatformDarwinKernel is currently not
+// compiled on other platforms due to the use of the Mac-specific
+// source/Host/macosx/cfcpp utilities.
+
+lldb_private::ConstString
+PlatformDarwinKernel::GetPluginNameStatic ()
+{
+    static ConstString g_name("darwin-kernel");
+    return g_name;
+}
+
+
 #endif // __APPLE__

Modified: lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.h?rev=181717&r1=181716&r2=181717&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.h (original)
+++ lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.h Mon May 13 13:22:55 2013
@@ -169,6 +169,22 @@ private:
 
 };
 
-#endif // __APPLE__
+#else   // __APPLE__
+
+// Since DynamicLoaderDarwinKernel is compiled in for all systems, and relies on
+// PlatformDarwinKernel for the plug-in name, we compile just the plug-in name in
+// here to avoid issues. We are tracking an internal bug to resolve this issue by
+// either not compiling in DynamicLoaderDarwinKernel for non-apple builds, or to make
+// PlatformDarwinKernel build on all systems. PlatformDarwinKernel is currently not
+// compiled on other platforms due to the use of the Mac-specific
+// source/Host/macosx/cfcpp utilities.
+
+class PlatformDarwinKernel
+{
+    static lldb_private::ConstString
+    GetPluginNameStatic ();
+};
+
+#endif  // __APPLE__
 
 #endif  // liblldb_PlatformDarwinKernel_h_