summaryrefslogtreecommitdiffstats
path: root/llvm
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
commita432b2efcfb3912669f54108dd78a91510314d87 (patch)
tree49229e0fbb2d77fbbac5190e2b3fd310b335739a /llvm
parentb3ba449cfbb9a7b216eea079b57dc534ba098492 (diff)
downloadbcm5719-llvm-a432b2efcfb3912669f54108dd78a91510314d87.tar.gz
bcm5719-llvm-a432b2efcfb3912669f54108dd78a91510314d87.zip
Fix configure issue where configure
turned "obj-c++" into "obj" in the langs line. Update configure script. llvm-svn: 57267
Diffstat (limited to 'llvm')
-rw-r--r--llvm/autoconf/configure.ac2
-rwxr-xr-xllvm/configure2
2 files changed, 2 insertions, 2 deletions
diff --git a/llvm/autoconf/configure.ac b/llvm/autoconf/configure.ac
index 5652ccc2937..3fd4c9b89c3 100644
--- a/llvm/autoconf/configure.ac
+++ b/llvm/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/llvm/configure b/llvm/configure
index fa1444cfce3..aa71c77ea39 100755
--- a/llvm/configure
+++ b/llvm/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
OpenPOWER on IntegriCloud