Fix false positive in C++ compiler detection

diff --git a/NEWS b/NEWS
index 2fbf8bd2d04eea1557a30c6791454cdc40416f39..69f73f740112a3916ead1ca1c73438a0e74b44c7 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,8 @@ Version 0.xx
 - Ignore another cargo/rust false positive; reported by Yogeswaran Umasankar
   (see Debian Bug #1037521).
 - Permit "no compiler commands" for cargo/rust projects.
 - Ignore another cargo/rust false positive; reported by Yogeswaran Umasankar
   (see Debian Bug #1037521).
 - Permit "no compiler commands" for cargo/rust projects.

+- Fix false positive in C++ compiler detection; reported by Rafael Laboissière
+  (Debian Bug #1069576).

 
 Version 0.14
 ------------
 
 Version 0.14
 ------------

diff --git a/bin/blhc b/bin/blhc
index 99d80bfc84da5468f6ec9bed710576d231c8becc..f90fd7a2e0422971cd2a7558d80b243fc18dd97e 100755 (executable)
--- a/bin/blhc
+++ b/bin/blhc
@@ -566,6 +566,7 @@ sub is_non_verbose_build {
     # C++ compiler setting.
     return 0 if $line =~ /^\s*C\+\+.+?:\s+(?:yes|no)\s*$/;
     return 0 if $line =~ /^\s*C\+\+ Library: stdc\+\+$/;
     # C++ compiler setting.
     return 0 if $line =~ /^\s*C\+\+.+?:\s+(?:yes|no)\s*$/;
     return 0 if $line =~ /^\s*C\+\+ Library: stdc\+\+$/;

+    return 0 if $line =~ /^\s*CXX\s*:\s*g\+\+\s*$/;

     # "Compiling" non binary files.
     return 0 if $line =~ /^\s*Compiling \S+\.(?:py|pyx|el)['"]?\s*(?:\.\.\.|because it changed\.)?$/;
     return 0 if $line =~ /^\s*[Cc]ompiling catalog \S+\.po\b/;
     # "Compiling" non binary files.
     return 0 if $line =~ /^\s*Compiling \S+\.(?:py|pyx|el)['"]?\s*(?:\.\.\.|because it changed\.)?$/;
     return 0 if $line =~ /^\s*[Cc]ompiling catalog \S+\.po\b/;

diff --git a/t/logs/false-positives b/t/logs/false-positives
index 8141dc7bfb53baff13f03eaad5e2ec0f2c72e082..d6128868637055e5dfc0f33b7fc9b11c30e1d397 100644 (file)
--- a/t/logs/false-positives
+++ b/t/logs/false-positives
@@ -16,6 +16,8 @@ rm -f afl-gcc afl-as afl-fuzz afl-showmap as afl-g++ afl-clang afl-clang++ *.o *
 
 19:49:25 runner  ../source3/script/build_env.sh /build/samba-4.4.4+dfsg/source3 /build/samba-4.4.4+dfsg/source3 /usr/bin/gcc > default/source3/include/build_env.h
 
 
 19:49:25 runner  ../source3/script/build_env.sh /build/samba-4.4.4+dfsg/source3 /build/samba-4.4.4+dfsg/source3 /usr/bin/gcc > default/source3/include/build_env.h
 

+         CXX      : g++
+

 # gcc -v can cause false positives.
 cd GUI && qmake
 /usr/bin/make -C GUI
 # gcc -v can cause false positives.
 cd GUI && qmake
 /usr/bin/make -C GUI