aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTanya Lattner <tonic@nondot.org>2008-10-07 22:21:03 +0000
committerTanya Lattner <tonic@nondot.org>2008-10-07 22:21:03 +0000
commitf85e74cc87dad95807a591160f1bd469ae0d4852 (patch)
treed6cdfd8352c3a3c6db483c7cca6c1d52cee33fd0
parent8c3f8b6dea6d8ddcc40e3d996caa93067ee64454 (diff)
Fix configure issue where configure
turned "obj-c++" into "obj" in the langs line. Update configure script. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@57267 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 5652ccc293..3fd4c9b89c 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 fa1444cfce..aa71c77ea3 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