diff options
| author | Chaoren Lin <chaorenl@google.com> | 2015-11-05 20:45:29 +0000 |
|---|---|---|
| committer | Chaoren Lin <chaorenl@google.com> | 2015-11-05 20:45:29 +0000 |
| commit | 2a7a94a65504399e6b425a92c63330da7de4de8a (patch) | |
| tree | 24b1c22664df1b1cc1597778c3c3e5ff2b78423c /lldb/source/Initialization | |
| parent | da7f428a4a7fa827e4c093fe76cb153ea034e568 (diff) | |
| download | bcm5719-llvm-2a7a94a65504399e6b425a92c63330da7de4de8a.tar.gz bcm5719-llvm-2a7a94a65504399e6b425a92c63330da7de4de8a.zip | |
Completely avoid building Apple simulator on non-Darwin platforms.
Summary:
This is a resubmission of r252179, but correctly ignores the source
files for other platforms.
Reviewers: granata.enrico, tberghammer, zturner, jingham
Subscribers: lldb-commits
Differential Revision: http://reviews.llvm.org/D14389
llvm-svn: 252205
Diffstat (limited to 'lldb/source/Initialization')
| -rw-r--r-- | lldb/source/Initialization/SystemInitializerCommon.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lldb/source/Initialization/SystemInitializerCommon.cpp b/lldb/source/Initialization/SystemInitializerCommon.cpp index 4067ad0d573..dbdd765d149 100644 --- a/lldb/source/Initialization/SystemInitializerCommon.cpp +++ b/lldb/source/Initialization/SystemInitializerCommon.cpp @@ -31,13 +31,13 @@ #include "Plugins/Platform/FreeBSD/PlatformFreeBSD.h" #include "Plugins/Platform/Kalimba/PlatformKalimba.h" #include "Plugins/Platform/Linux/PlatformLinux.h" -#include "Plugins/Platform/MacOSX/PlatformiOSSimulator.h" #include "Plugins/Platform/MacOSX/PlatformMacOSX.h" #include "Plugins/Platform/MacOSX/PlatformRemoteiOS.h" #include "Plugins/Platform/Windows/PlatformWindows.h" #include "Plugins/Process/gdb-remote/ProcessGDBRemoteLog.h" #if defined(__APPLE__) +#include "Plugins/Platform/MacOSX/PlatformiOSSimulator.h" #include "Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.h" #include "Plugins/ObjectFile/Mach-O/ObjectFileMachO.h" #include "Plugins/Platform/MacOSX/PlatformDarwinKernel.h" @@ -130,9 +130,9 @@ SystemInitializerCommon::Initialize() PlatformRemoteiOS::Initialize(); PlatformMacOSX::Initialize(); - PlatformiOSSimulator::Initialize(); #if defined(__APPLE__) + PlatformiOSSimulator::Initialize(); DynamicLoaderDarwinKernel::Initialize(); PlatformDarwinKernel::Initialize(); ObjectFileMachO::Initialize(); @@ -168,7 +168,6 @@ SystemInitializerCommon::Terminate() ObjectContainerUniversalMachO::Terminate(); PlatformMacOSX::Terminate(); PlatformRemoteiOS::Terminate(); - PlatformiOSSimulator::Terminate(); ClangASTContext::Terminate(); GoASTContext::Terminate(); @@ -178,6 +177,7 @@ SystemInitializerCommon::Terminate() EmulateInstructionMIPS64::Terminate(); #if defined(__APPLE__) + PlatformiOSSimulator::Terminate(); DynamicLoaderDarwinKernel::Terminate(); ObjectFileMachO::Terminate(); PlatformDarwinKernel::Terminate(); |
