Commit 496c30e1 authored by Bill Wendling's avatar Bill Wendling
Browse files

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.
------------------------------------------------------------------------

llvm-svn: 155852
parent 7a8da6c1

llvm/autoconf/configure.ac

+1 −1
Original line number Diff line number Diff line
@@ -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="")

llvm/configure

+3 −3
Original line number Diff line number Diff line
@@ -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