[llvm-branch-commits] [llvm-branch] r155852 - in /llvm/branches/release_31: ./ autoconf/configure.ac configure

[Bill Wendling]

Author: void
Date: Mon Apr 30 17:36:07 2012
New Revision: 155852

URL: http://llvm.org/viewvc/llvm-project?rev=155852&view=rev
Log:
Merging r155844:
------------------------------------------------------------------------
r155844 | spop | 2012-04-30 13:06:58 -0700 (Mon, 30 Apr 2012) | 8 lines

fix typo

Thanks to "Gabor Greif" <ggreif at 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.
------------------------------------------------------------------------

Modified:
    llvm/branches/release_31/   (props changed)
    llvm/branches/release_31/autoconf/configure.ac
    llvm/branches/release_31/configure

Propchange: llvm/branches/release_31/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 30 17:36:07 2012
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155166,155230,155284-155288,155307,155342,155466,155536,155668,155809,155813,155817-155818
+/llvm/trunk:155166,155230,155284-155288,155307,155342,155466,155536,155668,155809,155813,155817-155818,155844

Modified: llvm/branches/release_31/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_31/autoconf/configure.ac?rev=155852&r1=155851&r2=155852&view=diff
==============================================================================
--- llvm/branches/release_31/autoconf/configure.ac (original)
+++ llvm/branches/release_31/autoconf/configure.ac Mon Apr 30 17:36:07 2012
@@ -838,7 +838,7 @@
 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="")

Modified: llvm/branches/release_31/configure
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_31/configure?rev=155852&r1=155851&r2=155852&view=diff
==============================================================================
--- llvm/branches/release_31/configure (original)
+++ llvm/branches/release_31/configure Mon Apr 30 17:36:07 2012
@@ -5584,9 +5584,9 @@
 
 
 
-# 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