[Lldb-commits] [lldb] r218762 - Add a bandaid to fix the FreeBSD build

[Todd Fiala]

Yeah I was actually going to revert that back to ProcessMonitor.h (without
path) and have Tong rework the Android.mk build to provide proper pathing
to the Linux one in the header dirs.  But this'll work for now.

-Todd

On Wed, Oct 1, 2014 at 5:56 AM, Ed Maste <emaste at freebsd.org> wrote:

> Author: emaste
> Date: Wed Oct  1 07:56:39 2014
> New Revision: 218762
>
> URL: http://llvm.org/viewvc/llvm-project?rev=218762&view=rev
> Log:
> Add a bandaid to fix the FreeBSD build
>
> r218568 added an explicit #include of the Linux ProcessMonitor.h to
> POSIXThread.cpp, rather than including just "ProcessMonitor.h" and
> relying on the build infrastructure for the appropriate paths.
>
> For now add #ifdefs in the source to use the FreeBSD or Linux header
> as appropriate; a cleaner fix (and perhaps some refactoring of the
> POSIX classes) should still be done later.
>
> Modified:
>
> lldb/trunk/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_x86.cpp
>
> Modified:
> lldb/trunk/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_x86.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_x86.cpp?rev=218762&r1=218761&r2=218762&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_x86.cpp
> (original)
> +++
> lldb/trunk/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_x86.cpp
> Wed Oct  1 07:56:39 2014
> @@ -12,7 +12,11 @@
>
>  #include "Plugins/Process/POSIX/ProcessPOSIX.h"
>  #include "RegisterContextPOSIXProcessMonitor_x86.h"
> +#if defined(__FreeBSD__)
> +#include "Plugins/Process/FreeBSD/ProcessMonitor.h"
> +#elif defined(__linux__)
>  #include "Plugins/Process/Linux/ProcessMonitor.h"
> +#endif
>
>  using namespace lldb_private;
>  using namespace lldb;
>
>
> _______________________________________________
> lldb-commits mailing list
> lldb-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
>



-- 
Todd Fiala | Software Engineer | tfiala at google.com
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20141001/d5f2fe8f/attachment.html>