summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Roelofs <jonathan@codesourcery.com>2015-04-29 20:06:41 +0000
committerJonathan Roelofs <jonathan@codesourcery.com>2015-04-29 20:06:41 +0000
commitb241283669d0646de58df2aed4008603bbeaaf84 (patch)
tree6a3de5d95bd237a5e10a034b47c78f41a9be60e2
parent38f2883ff93f489bdaff059bb0f2f7b8264538cd (diff)
Clean up docs references to './configure' in preparation for deprecating in-source builds
http://reviews.llvm.org/D8787 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@236144 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--autoconf/configure.ac2
-rwxr-xr-xconfigure4
-rw-r--r--docs/BuildingLLVMWithAutotools.rst10
-rw-r--r--docs/FAQ.rst2
-rw-r--r--docs/HowToBuildOnARM.rst2
5 files changed, 10 insertions, 10 deletions
diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index 10b95a0724c..39ce9f353ee 100644
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -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
diff --git a/configure b/configure
index 7ddb0f32f9b..f51617639b3 100755
--- a/configure
+++ b/configure
@@ -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
diff --git a/docs/BuildingLLVMWithAutotools.rst b/docs/BuildingLLVMWithAutotools.rst
index 4c04f1e1865..6f9a1341055 100644
--- a/docs/BuildingLLVMWithAutotools.rst
+++ b/docs/BuildingLLVMWithAutotools.rst
@@ -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 not yet been converted to the new
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 following:
.. 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 autoconf manner:
.. 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:
diff --git a/docs/FAQ.rst b/docs/FAQ.rst
index 8db94c6250c..0559a1ff215 100644
--- a/docs/FAQ.rst
+++ b/docs/FAQ.rst
@@ -102,7 +102,7 @@ grabbing the wrong linker/assembler/etc, there are two ways to fix it:
.. 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.
diff --git a/docs/HowToBuildOnARM.rst b/docs/HowToBuildOnARM.rst
index f2edaef76cd..6579d36a72a 100644
--- a/docs/HowToBuildOnARM.rst
+++ b/docs/HowToBuildOnARM.rst
@@ -40,7 +40,7 @@ on the ARMv6 and ARMv7 architectures and may be inapplicable to older chips.
.. 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 \