diff options
| author | Todd Fiala <tfiala@google.com> | 2014-03-13 21:16:13 +0000 |
|---|---|---|
| committer | Todd Fiala <tfiala@google.com> | 2014-03-13 21:16:13 +0000 |
| commit | 8a5c5a016cf07fa71dde21eb128256be7924f216 (patch) | |
| tree | a262523f529601c1122a169dd332f9d8f5f3eaba /lldb/tools/debugserver/source | |
| parent | 59abbd4d9bf349219295979b0b0831103cf73b71 (diff) | |
| download | bcm5719-llvm-8a5c5a016cf07fa71dde21eb128256be7924f216.tar.gz bcm5719-llvm-8a5c5a016cf07fa71dde21eb128256be7924f216.zip | |
Fix cmake build issues on Darwin.
llvm-svn: 203850
Diffstat (limited to 'lldb/tools/debugserver/source')
4 files changed, 9 insertions, 1 deletions
diff --git a/lldb/tools/debugserver/source/CMakeLists.txt b/lldb/tools/debugserver/source/CMakeLists.txt index d9b4fea657f..05d69831567 100644 --- a/lldb/tools/debugserver/source/CMakeLists.txt +++ b/lldb/tools/debugserver/source/CMakeLists.txt @@ -40,6 +40,8 @@ add_library(lldbDebugserverCommon add_dependencies(lldbDebugserverCommon generate_dnbconfig) if (CMAKE_SYSTEM_NAME MATCHES "Darwin") + find_library(COCOA_LIBRARY Cocoa) + target_link_libraries(lldbDebugserverCommon ${COCOA_LIBRARY}) add_subdirectory(MacOSX) endif() diff --git a/lldb/tools/debugserver/source/MacOSX/CMakeLists.txt b/lldb/tools/debugserver/source/MacOSX/CMakeLists.txt index b955917e2e3..8e2ec1c66e4 100644 --- a/lldb/tools/debugserver/source/MacOSX/CMakeLists.txt +++ b/lldb/tools/debugserver/source/MacOSX/CMakeLists.txt @@ -40,6 +40,12 @@ add_lldb_executable(debugserver ${generated_mach_interfaces} ) +set_source_files_properties( + HasAVX.s + # Necessary since compilation will fail with stand-alone assembler + PROPERTIES LANGUAGE C COMPILE_FLAGS "-x assembler-with-cpp" + ) + add_dependencies(debugserver generate_dnbconfig) target_link_libraries(debugserver ${DEBUGSERVER_USED_LIBS}) diff --git a/lldb/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp b/lldb/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp index e2d39311a66..f683635d926 100644 --- a/lldb/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp +++ b/lldb/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp @@ -18,6 +18,7 @@ #include <sys/sysctl.h> #include "MacOSX/x86_64/DNBArchImplX86_64.h" +#include "../HasAVX.h" #include "DNBLog.h" #include "MachThread.h" #include "MachProcess.h" diff --git a/lldb/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.h b/lldb/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.h index ac171ee7642..e9ba50f7ab6 100644 --- a/lldb/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.h +++ b/lldb/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.h @@ -16,7 +16,6 @@ #if defined (__i386__) || defined (__x86_64__) #include "DNBArch.h" -#include "../HasAVX.h" #include "MachRegisterStatesX86_64.h" #include <map> |
