[libcxxabi] r220049 - [libcxxabi] Document the standalone build's requirements on llvm-config and llvm sources.

Eric Fiselier eric at efcs.ca
Fri Oct 17 09:32:06 PDT 2014


Author: ericwf
Date: Fri Oct 17 11:32:06 2014
New Revision: 220049

URL: http://llvm.org/viewvc/llvm-project?rev=220049&view=rev
Log:
[libcxxabi] Document the standalone build's requirements on llvm-config and llvm sources.

The current documentation does not explain that the standalone build requires
the LLVM sources. This patch updates the documentation to reflect this
requirement and explains how to manually specify the location of the required
files.

Modified:
    libcxxabi/trunk/CMakeLists.txt
    libcxxabi/trunk/www/index.html

Modified: libcxxabi/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/CMakeLists.txt?rev=220049&r1=220048&r2=220049&view=diff
==============================================================================
--- libcxxabi/trunk/CMakeLists.txt (original)
+++ libcxxabi/trunk/CMakeLists.txt Fri Oct 17 11:32:06 2014
@@ -46,7 +46,9 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR
     set(LLVM_CMAKE_PATH "${LLVM_BINARY_DIR}/share/llvm/cmake")
     set(LLVM_LIT_PATH "${LLVM_PATH}/utils/lit/lit.py")
   else()
-    message(FATAL_ERROR "llvm-config not found and LLVM_MAIN_SRC_DIR not defined")
+    message(FATAL_ERROR "llvm-config not found and LLVM_MAIN_SRC_DIR not defined. "
+                        "Reconfigure with -DLLVM_CONFIG=path/to/llvm-config "
+                        "or -DLLVM_PATH=path/to/llvm-source-root.")
   endif()
 
   if(EXISTS ${LLVM_CMAKE_PATH})

Modified: libcxxabi/trunk/www/index.html
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/www/index.html?rev=220049&r1=220048&r2=220049&view=diff
==============================================================================
--- libcxxabi/trunk/www/index.html (original)
+++ libcxxabi/trunk/www/index.html Fri Oct 17 11:32:06 2014
@@ -96,6 +96,16 @@
     linux you may need -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++</code></li>
   <li><code>make</code></li>
   </ul>
+  <p> By default CMake uses <code>llvm-config</code> to locate the required
+      LLVM sources. If CMake cannot find <code>llvm-config</code> then you must
+      configure CMake using either of the following options.
+  </p>
+  <ul>
+  <li><code>-DLLVM_CONFIG=path/to/llvm-config</code></li>
+  <li><code>-DLLVM_PATH=path/to/llvm-source-root</code></li>
+  </ul>
+
+  </p>
 
   <p>To run the tests:</p>
   <ul>





More information about the cfe-commits mailing list