[llvm] r236144 - Clean up docs references to './configure' in preparation for deprecating in-source builds

Jonathan Roelofs jonathan at codesourcery.com
Wed Apr 29 13:06:41 PDT 2015


Author: jroelofs
Date: Wed Apr 29 15:06:41 2015
New Revision: 236144

URL: http://llvm.org/viewvc/llvm-project?rev=236144&view=rev
Log:
Clean up docs references to './configure' in preparation for deprecating in-source builds

http://reviews.llvm.org/D8787

Modified:
    llvm/trunk/autoconf/configure.ac
    llvm/trunk/configure
    llvm/trunk/docs/BuildingLLVMWithAutotools.rst
    llvm/trunk/docs/FAQ.rst
    llvm/trunk/docs/HowToBuildOnARM.rst

Modified: llvm/trunk/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/autoconf/configure.ac?rev=236144&r1=236143&r2=236144&view=diff
==============================================================================
--- llvm/trunk/autoconf/configure.ac (original)
+++ llvm/trunk/autoconf/configure.ac Wed Apr 29 15:06:41 2015
@@ -105,7 +105,7 @@ if test "$CXX" = "clang++" ; then
 ],
 [
   AC_MSG_RESULT([no])
-  AC_MSG_ERROR([Selected compiler could not find or parse C++ standard library headers.  Rerun with CC=c-compiler CXX=c++-compiler ./configure ...])
+  AC_MSG_ERROR([Selected compiler could not find or parse C++ standard library headers.  Rerun with CC=c-compiler CXX=c++-compiler LLVM_SRC_DIR/configure ...])
 ])
   AC_LANG_POP([C++])
 fi

Modified: llvm/trunk/configure
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/configure?rev=236144&r1=236143&r2=236144&view=diff
==============================================================================
--- llvm/trunk/configure (original)
+++ llvm/trunk/configure Wed Apr 29 15:06:41 2015
@@ -3605,8 +3605,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
   { echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6; }
-  { { echo "$as_me:$LINENO: error: Selected compiler could not find or parse C++ standard library headers.  Rerun with CC=c-compiler CXX=c++-compiler ./configure ..." >&5
-echo "$as_me: error: Selected compiler could not find or parse C++ standard library headers.  Rerun with CC=c-compiler CXX=c++-compiler ./configure ..." >&2;}
+  { { echo "$as_me:$LINENO: error: Selected compiler could not find or parse C++ standard library headers.  Rerun with CC=c-compiler CXX=c++-compiler LLVM_SRC_DIR/configure ..." >&5
+echo "$as_me: error: Selected compiler could not find or parse C++ standard library headers.  Rerun with CC=c-compiler CXX=c++-compiler LLVM_SRC_DIR/configure ..." >&2;}
    { (exit 1); exit 1; }; }
 
 fi

Modified: llvm/trunk/docs/BuildingLLVMWithAutotools.rst
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/BuildingLLVMWithAutotools.rst?rev=236144&r1=236143&r2=236144&view=diff
==============================================================================
--- llvm/trunk/docs/BuildingLLVMWithAutotools.rst (original)
+++ llvm/trunk/docs/BuildingLLVMWithAutotools.rst Wed Apr 29 15:06:41 2015
@@ -121,7 +121,7 @@ To configure LLVM, follow these steps:
 
    .. code-block:: console
 
-     % SRC_ROOT/configure --prefix=/install/path [other options]
+     % $LLVM_SRC_DIR/configure --prefix=/install/path [other options]
 
 Compiling the LLVM Suite Source Code
 ------------------------------------
@@ -187,7 +187,7 @@ source code:
 ``gmake install``
 
   Installs LLVM header files, libraries, tools, and documentation in a hierarchy
-  under ``$PREFIX``, specified with ``./configure --prefix=[dir]``, which
+  under ``$PREFIX``, specified with ``$LLVM_SRC_DIR/configure --prefix=[dir]``, which
   defaults to ``/usr/local``.
 
 ``gmake -C runtime install-bytecode``
@@ -240,7 +240,7 @@ There are some HTML documents that have
 system (which uses the easy-to-read and easy-to-write
 `reStructuredText <http://sphinx-doc.org/rest.html>`_ plaintext markup
 language).
-The generated documentation is built in the ``SRC_ROOT/docs`` directory using
+The generated documentation is built in the ``$LLVM_SRC_DIR/docs`` directory using
 a special makefile.
 For instructions on how to install Sphinx, see
 `Sphinx Introduction for LLVM Developers
@@ -250,7 +250,7 @@ HTML documentation by doing the followin
 
 .. code-block:: console
 
-  $ cd SRC_ROOT/docs
+  $ cd $LLVM_SRC_DIR/docs
   $ make -f Makefile.sphinx
 
 This creates a ``_build/html`` sub-directory with all of the HTML files, not
@@ -296,7 +296,7 @@ This is accomplished in the typical auto
 
   .. code-block:: console
 
-    % SRC_ROOT/configure
+    % $LLVM_SRC_DIR/configure
 
 The LLVM build will place files underneath *OBJ_ROOT* in directories named after
 the build type:

Modified: llvm/trunk/docs/FAQ.rst
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/FAQ.rst?rev=236144&r1=236143&r2=236144&view=diff
==============================================================================
--- llvm/trunk/docs/FAQ.rst (original)
+++ llvm/trunk/docs/FAQ.rst Wed Apr 29 15:06:41 2015
@@ -102,7 +102,7 @@ grabbing the wrong linker/assembler/etc,
 
 .. code-block:: console
 
-   % PATH=[the path without the bad program] ./configure ...
+   % PATH=[the path without the bad program] $LLVM_SRC_DIR/configure ...
 
 This is still somewhat inconvenient, but it allows ``configure`` to do its
 work without having to adjust your ``PATH`` permanently.

Modified: llvm/trunk/docs/HowToBuildOnARM.rst
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/HowToBuildOnARM.rst?rev=236144&r1=236143&r2=236144&view=diff
==============================================================================
--- llvm/trunk/docs/HowToBuildOnARM.rst (original)
+++ llvm/trunk/docs/HowToBuildOnARM.rst Wed Apr 29 15:06:41 2015
@@ -40,7 +40,7 @@ on the ARMv6 and ARMv7 architectures and
 
    .. code-block:: bash
 
-     ./configure --build=armv7l-unknown-linux-gnueabihf \
+     ../$LLVM_SRC_DIR/configure --build=armv7l-unknown-linux-gnueabihf \
      --host=armv7l-unknown-linux-gnueabihf \
      --target=armv7l-unknown-linux-gnueabihf --with-cpu=cortex-a9 \
      --with-float=hard --with-abi=aapcs-vfp --with-fpu=neon \





More information about the llvm-commits mailing list