summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBill Wendling <isanbard@gmail.com>2012-04-30 22:36:07 +0000
committerBill Wendling <isanbard@gmail.com>2012-04-30 22:36:07 +0000
commit4ebe2712b67463a84337fca29d5fd06991ca7320 (patch)
tree9338d8ff611d29db65c0d5e7283e65f28882770b
parentc70ebff18a5cbb863576a525ba3a5fe0cf9216a4 (diff)
downloadllvm-4ebe2712b67463a84337fca29d5fd06991ca7320.tar.gz
Merging r155844:
------------------------------------------------------------------------ r155844 | spop | 2012-04-30 13:06:58 -0700 (Mon, 30 Apr 2012) | 8 lines fix typo Thanks to "Gabor Greif" <ggreif@gmail.com> for reporting this problem. The configure flag should be --with-default-sysroot as documented, and not --with-sysroot. The reason we don't want to define --with-sysroot is that GCC has a configure flag by that name and it has a different semantics. ------------------------------------------------------------------------ git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_31@155852 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--autoconf/configure.ac2
-rwxr-xr-xconfigure6
2 files changed, 4 insertions, 4 deletions
diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index a3961efe1b52..51f89217a9f6 100644
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -838,7 +838,7 @@ AC_ARG_WITH(gcc-toolchain,
AC_DEFINE_UNQUOTED(GCC_INSTALL_PREFIX,"$withval",
[Directory where gcc is installed.])
-AC_ARG_WITH(sysroot,
+AC_ARG_WITH(default-sysroot,
AS_HELP_STRING([--with-default-sysroot],
[Add --sysroot=<path> to all compiler invocations.]),,
withval="")
diff --git a/configure b/configure
index df462a923a54..efa80dbeb952 100755
--- a/configure
+++ b/configure
@@ -5584,9 +5584,9 @@ _ACEOF
-# Check whether --with-sysroot was given.
-if test "${with_sysroot+set}" = set; then
- withval=$with_sysroot;
+# Check whether --with-default-sysroot was given.
+if test "${with_default_sysroot+set}" = set; then
+ withval=$with_default_sysroot;
else
withval=""
fi