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

diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index 5652ccc29371998c49455e8b01d8e3934695a2e4..3fd4c9b89c32be953e377621f815be6e5b5981aa 100644 (file)
--- 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 fa1444cfce320fdaae9068bfee2851d45474bf0a..aa71c77ea3992c147a6495060900772d9e743f80 100755 (executable)
--- 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