aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xconfigure2
-rw-r--r--test/FrontendObjC++/dg.exp2
-rw-r--r--test/lib/llvm.exp2
3 files changed, 3 insertions, 3 deletions
diff --git a/configure b/configure
index 8520c89908..e4e155af41 100755
--- a/configure
+++ b/configure
@@ -34242,7 +34242,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
diff --git a/test/FrontendObjC++/dg.exp b/test/FrontendObjC++/dg.exp
index 15fb0bb484..41c3db2af0 100644
--- a/test/FrontendObjC++/dg.exp
+++ b/test/FrontendObjC++/dg.exp
@@ -1,5 +1,5 @@
load_lib llvm.exp
-if [ llvm_gcc_supports objc++ ] then {
+if [ llvm_gcc_supports obj-c++ ] then {
RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{mm}]]
}
diff --git a/test/lib/llvm.exp b/test/lib/llvm.exp
index 8c7cbfd214..3d7588dd6e 100644
--- a/test/lib/llvm.exp
+++ b/test/lib/llvm.exp
@@ -237,7 +237,7 @@ proc llvm_gcc_supports { lang } {
c { set file cc1 }
c++ { set file cc1plus }
objc { set file cc1obj }
- objc++ { set file cc1objplus }
+ obj-c++ { set file cc1objplus }
fortran { set file f951 }
default { return 0 }
}