sgraenitz updated this revision to Diff 180679.
sgraenitz added a comment.
Update documentation: libc++ should be checked out when building for macOS
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D56399/new/
https://reviews.llvm.org/D56399
Files:
CMakeLists.txt
www/build.html
Index: www/build.html
===================================================================
--- www/build.html
+++ www/build.html
@@ -160,7 +160,7 @@
<li>In Xcode 4.x: <b>lldb/lldb.xcworkspace</b>, select the
<b>lldb-tool</b> scheme, and build.</li>
</ul>
<h2>Building LLDB with CMake</h2>
- <p> First download the LLVM, Clang, and LLDB sources. Refer to <a
href="source.html">this page</a> for precise instructions on this step.</p>
+ <p> First download the LLVM, Clang, libc++ and LLDB sources. Refer
to <a href="source.html">this page</a> for precise instructions on this
step.</p>
<p> Refer to the code signing instructions in
<b>lldb/docs/code-signing.txt</b> for info on codesigning debugserver during
the build.</p>
<p> Using CMake is documented on the <a
href="http://llvm.org/docs/CMake.html";>Building LLVM with CMake</a> page.
Ninja is the recommended generator to use when building LLDB with
CMake.</p>
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -101,10 +101,22 @@
list(APPEND LLDB_TEST_DEPS liblldb)
endif()
+ # Add dependencies if we test with the in-tree clang.
+ # This works with standalone builds as they import the clang target.
if(TARGET clang)
list(APPEND LLDB_TEST_DEPS clang)
if(APPLE)
- list(APPEND LLDB_TEST_DEPS cxx)
+ # If we build clang, we should build libcxx.
+ # FIXME: Standalone builds should import the cxx target as well.
+ if(LLDB_BUILT_STANDALONE)
+ # For now check that the include directory exists.
+ set(cxx_dir "${LLVM_DIR}/../../../include/c++")
+ if(NOT EXISTS ${cxx_dir})
+ message(WARNING "LLDB test suite requires libc++ in
llvm/projects/libcxx or an existing build symlinked to ${cxx_dir}")
+ endif()
+ else()
+ list(APPEND LLDB_TEST_DEPS cxx)
+ endif()
endif()
endif()
Index: www/build.html
===================================================================
--- www/build.html
+++ www/build.html
@@ -160,7 +160,7 @@
<li>In Xcode 4.x: <b>lldb/lldb.xcworkspace</b>, select the <b>lldb-tool</b> scheme, and build.</li>
</ul>
<h2>Building LLDB with CMake</h2>
- <p> First download the LLVM, Clang, and LLDB sources. Refer to <a href="source.html">this page</a> for precise instructions on this step.</p>
+ <p> First download the LLVM, Clang, libc++ and LLDB sources. Refer to <a href="source.html">this page</a> for precise instructions on this step.</p>
<p> Refer to the code signing instructions in <b>lldb/docs/code-signing.txt</b> for info on codesigning debugserver during the build.</p>
<p> Using CMake is documented on the <a href="http://llvm.org/docs/CMake.html";>Building LLVM with CMake</a> page.
Ninja is the recommended generator to use when building LLDB with CMake.</p>
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -101,10 +101,22 @@
list(APPEND LLDB_TEST_DEPS liblldb)
endif()
+ # Add dependencies if we test with the in-tree clang.
+ # This works with standalone builds as they import the clang target.
if(TARGET clang)
list(APPEND LLDB_TEST_DEPS clang)
if(APPLE)
- list(APPEND LLDB_TEST_DEPS cxx)
+ # If we build clang, we should build libcxx.
+ # FIXME: Standalone builds should import the cxx target as well.
+ if(LLDB_BUILT_STANDALONE)
+ # For now check that the include directory exists.
+ set(cxx_dir "${LLVM_DIR}/../../../include/c++")
+ if(NOT EXISTS ${cxx_dir})
+ message(WARNING "LLDB test suite requires libc++ in llvm/projects/libcxx or an existing build symlinked to ${cxx_dir}")
+ endif()
+ else()
+ list(APPEND LLDB_TEST_DEPS cxx)
+ endif()
endif()
endif()
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
