Detect more CXX non-verbose builds.

diff --git a/bin/blhc b/bin/blhc
index bd9ebbdb644eb52ca5b9f782f9ff0616077dc02e..bcae721394c72702bf21630df02e75c71211be77 100755 (executable)
--- a/bin/blhc
+++ b/bin/blhc
@@ -168,7 +168,7 @@ sub is_non_verbose_build {
     my ($line, $next_line, $skip_ref) = @_;
 
     if (not ($line =~ /^checking if you want to see long compiling messages\.\.\. no/
-                or $line =~ /^\s*\[?(?:CC|CCLD|LD)\]?\s+(.+?)$/
+                or $line =~ /^\s*\[?(?:CC|CCLD|CXX|CXXLD|LD)\]?\s+(.+?)$/
                 or $line =~ /^\s*(?:C|c)ompiling\s+(.+?)(?:\.\.\.)?$/
                 or $line =~ /^\s*(?:B|b)uilding (?:program|shared library)\s+(.+?)$/
                 or $line =~ /^\s*\[[\d ]+%\] Building (?:C|CXX) object (.+?)$/)) {

diff --git a/t/logs/verbose-build b/t/logs/verbose-build
index 940ab772fb26238fdc1de2677c6eae214c9a9364..b013028e5073d7a0217a34e591a40b662288a9f4 100644 (file)
--- a/t/logs/verbose-build
+++ b/t/logs/verbose-build
@@ -16,9 +16,18 @@ checking whether compiling and linking against OpenSSL works... yes
 ...
   CCLD   libtest.la
 
+
+  CXX    libtest-a.lo
+  CXX    libtest-b.lo
+  CXX    libtest_c.lo
+  CXX    libtest-d.lo
+...
+  CXXLD  libtest.la
+
       [CC]   src/test-a.o
       [CC]   src/test-b.o
       [CC]   src/test_c.o
+      [CXX]  src/test-d.o
 ...
       [LD]   src/test.o
 

diff --git a/t/tests.t b/t/tests.t
index f29ac11011d23a4bb0e72e5aae30eb85905ddd9f..0cd73f4ec56ff88943c7575b5e05798226bc2dff 100644 (file)
--- a/t/tests.t
+++ b/t/tests.t
@@ -309,9 +309,15 @@ NONVERBOSE BUILD:   CC     libtest-b.lo
 NONVERBOSE BUILD:   CC     libtest_c.lo
 NONVERBOSE BUILD:   CC     libtest-d.lo
 NONVERBOSE BUILD:   CCLD   libtest.la
+NONVERBOSE BUILD:   CXX    libtest-a.lo
+NONVERBOSE BUILD:   CXX    libtest-b.lo
+NONVERBOSE BUILD:   CXX    libtest_c.lo
+NONVERBOSE BUILD:   CXX    libtest-d.lo
+NONVERBOSE BUILD:   CXXLD  libtest.la
 NONVERBOSE BUILD:       [CC]   src/test-a.o
 NONVERBOSE BUILD:       [CC]   src/test-b.o
 NONVERBOSE BUILD:       [CC]   src/test_c.o
+NONVERBOSE BUILD:       [CXX]  src/test-d.o
 NONVERBOSE BUILD:       [LD]   src/test.o
 NONVERBOSE BUILD:       [CC]   src/test-a.o
 NONVERBOSE BUILD:       [CC]   src/test-b.o