aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTanya Lattner <tonic@nondot.org>2008-10-07 22:34:35 +0000
committerTanya Lattner <tonic@nondot.org>2008-10-07 22:34:35 +0000
commit7149ac167cd46e460028b725c820692d230d06bd (patch)
tree8a23b14737942a45e9eb623bfaeca2a3fa1a1e39
parent892d232136804b6de689bb734573902abf6a8dc9 (diff)
Merge from mainline.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_24@57269 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--autoconf/configure.ac2
-rwxr-xr-xconfigure2
2 files changed, 2 insertions, 2 deletions
diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index e96850bf7c..f6167b72b2 100644
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -872,7 +872,7 @@ if test "$llvm_cv_llvmgcc_sanity" = "yes" ; then
llvmgccmajvers=[`echo $llvmgccversion | sed 's/^\([0-9]\).*/\1/'`]
AC_SUBST(LLVMGCC_VERSION,$llvmgccversion)
AC_SUBST(LLVMGCC_MAJVERS,$llvmgccmajvers)
- llvmgcclangs=[`"$LLVMGCC" -v --help 2>&1 | grep '^Configured with:' | sed 's/^.*--enable-languages=\([^ -]*\).*/\1/'`]
+ llvmgcclangs=[`"$LLVMGCC" -v --help 2>&1 | grep '^Configured with:' | sed 's/^.*--enable-languages=\([^ ]*\).*/\1/'`]
AC_SUBST(LLVMGCC_LANGS,$llvmgcclangs)
AC_MSG_RESULT([ok])
fi
diff --git a/configure b/configure
index e6bd09439f..5fa3ad4080 100755
--- a/configure
+++ b/configure
@@ -34246,7 +34246,7 @@ echo $ECHO_N "checking llvm-gcc component support... $ECHO_C" >&6; }
LLVMGCC_MAJVERS=$llvmgccmajvers
- llvmgcclangs=`"$LLVMGCC" -v --help 2>&1 | grep '^Configured with:' | sed 's/^.*--enable-languages=\([^ -]*\).*/\1/'`
+ llvmgcclangs=`"$LLVMGCC" -v --help 2>&1 | grep '^Configured with:' | sed 's/^.*--enable-languages=\([^ ]*\).*/\1/'`
LLVMGCC_LANGS=$llvmgcclangs
{ echo "$as_me:$LINENO: result: ok" >&5