diff options
| author | Bill Wendling <isanbard@gmail.com> | 2012-04-30 22:36:07 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2012-04-30 22:36:07 +0000 |
| commit | 496c30e19ef3738bddc890421203f01f7cd09b6b (patch) | |
| tree | 633f9a0ed93ce4d0b0ca88bb05f130942e3c9102 | |
| parent | 7a8da6c1bd7f15aaeaf22eabf20801e88346def1 (diff) | |
| download | llvm-496c30e19ef3738bddc890421203f01f7cd09b6b.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.
------------------------------------------------------------------------
llvm-svn: 155852
| -rw-r--r-- | llvm/autoconf/configure.ac | 2 | ||||
| -rwxr-xr-x | llvm/configure | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/llvm/autoconf/configure.ac b/llvm/autoconf/configure.ac index a3961efe1b52..51f89217a9f6 100644 --- a/llvm/autoconf/configure.ac +++ b/llvm/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/llvm/configure b/llvm/configure index df462a923a54..efa80dbeb952 100755 --- a/llvm/configure +++ b/llvm/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 |