summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephane Sezer <sas@cd80.net>2015-10-06 18:03:04 +0000
committerStephane Sezer <sas@cd80.net>2015-10-06 18:03:04 +0000
commitd16d6c0046899a28bf0da5fd4ccefa7e155bfc1e (patch)
tree52ad3af2a4b31880afd6c52c88825d63d5148328
parent4edfef454d1a7d7e2e53cef28ea87c3067b40a83 (diff)
downloadbcm5719-llvm-d16d6c0046899a28bf0da5fd4ccefa7e155bfc1e.tar.gz
bcm5719-llvm-d16d6c0046899a28bf0da5fd4ccefa7e155bfc1e.zip
Fix Darwin build of lldb-server.
Summary: We were missing the symbol for the version number. Reviewers: clayborg Subscribers: lldb-commits Differential Revision: http://reviews.llvm.org/D13271 llvm-svn: 249434
-rw-r--r--lldb/cmake/LLDBDependencies.cmake7
-rw-r--r--lldb/source/CMakeLists.txt11
2 files changed, 11 insertions, 7 deletions
diff --git a/lldb/cmake/LLDBDependencies.cmake b/lldb/cmake/LLDBDependencies.cmake
index 9bb4b7886cb..1aa62a6226f 100644
--- a/lldb/cmake/LLDBDependencies.cmake
+++ b/lldb/cmake/LLDBDependencies.cmake
@@ -103,13 +103,6 @@ endif ()
# Darwin-only libraries
if ( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
- set(LLDB_VERS_GENERATED_FILE ${LLDB_BINARY_DIR}/source/LLDB_vers.c)
- add_custom_command(OUTPUT ${LLDB_VERS_GENERATED_FILE}
- COMMAND ${LLDB_SOURCE_DIR}/scripts/generate-vers.pl
- ${LLDB_SOURCE_DIR}/lldb.xcodeproj/project.pbxproj liblldb_core
- > ${LLDB_VERS_GENERATED_FILE})
-
- set_source_files_properties(${LLDB_VERS_GENERATED_FILE} PROPERTIES GENERATED 1)
list(APPEND LLDB_USED_LIBS
lldbPluginDynamicLoaderDarwinKernel
lldbPluginObjectFileMachO
diff --git a/lldb/source/CMakeLists.txt b/lldb/source/CMakeLists.txt
index 0470e512340..f2f006403bd 100644
--- a/lldb/source/CMakeLists.txt
+++ b/lldb/source/CMakeLists.txt
@@ -25,8 +25,19 @@ include_directories(
)
endif ()
+if ( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
+ set(LLDB_VERS_GENERATED_FILE ${LLDB_BINARY_DIR}/source/LLDB_vers.c)
+ add_custom_command(OUTPUT ${LLDB_VERS_GENERATED_FILE}
+ COMMAND ${LLDB_SOURCE_DIR}/scripts/generate-vers.pl
+ ${LLDB_SOURCE_DIR}/lldb.xcodeproj/project.pbxproj liblldb_core
+ > ${LLDB_VERS_GENERATED_FILE})
+
+ set_source_files_properties(${LLDB_VERS_GENERATED_FILE} PROPERTIES GENERATED 1)
+endif ()
+
add_lldb_library(lldbBase
lldb.cpp
+ ${LLDB_VERS_GENERATED_FILE}
)
add_subdirectory(Breakpoint)
OpenPOWER on IntegriCloud