From bc6e920d8047a414012dd7f7dc152916d0670427 Mon Sep 17 00:00:00 2001
From: Simon Ruderich <simon@ruderich.org>
Date: Sun, 23 Jul 2017 16:12:28 +0200
Subject: [PATCH] Handle Open MPI mpicc/mpicxx compiler wrappers
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

The wrapper wasn't treated as compiler causing the non-verbose detection
to trigger as the next line seemingly contained no compiler command.

Reported by Nico Schlömer. See [1] for a build log which was affected.

[1]: https://buildd.debian.org/status/fetch.php?pkg=trilinos&arch=amd64&ver=12.10.1-4&stamp=1500253714&raw=1
---
 NEWS                 | 2 ++
 bin/blhc             | 2 +-
 t/logs/verbose-build | 5 +++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 1638007..b666489 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,8 @@ Version 0.XX
 
 - Support new dpkg versions which replaced Dpkg::Arch's debarch_to_debtriplet
   with debarch_to_debtuple (Debian Bug #844393), reported by Johannes Schauer.
+- Support Open MPI mpicc/mpicxx compiler wrappers to prevent false positives
+  in non-verbose-build detection, reported by Nico Schlömer.
 
 
 Version 0.07
diff --git a/bin/blhc b/bin/blhc
index 6e5e8f4..0e90707 100755
--- a/bin/blhc
+++ b/bin/blhc
@@ -33,7 +33,7 @@ our $VERSION = '0.07';
 my $cc_regex = qr/
     (?<!\s-)               # ignore options, e.g. "-c++" [sic!] (used by swig)
     (?<!\.)                # ignore file names, e.g. "test.gcc"
-    (?:cc|gcc|g\+\+|c\+\+)
+    (?:cc|gcc|g\+\+|c\+\+|mpicc|mpicxx)
     (?:-[\d.]+)?           # version suffix, e.g. "gcc-4.6"
     /x;
 # Full regex which matches the complete compiler name. Used in a few places to
diff --git a/t/logs/verbose-build b/t/logs/verbose-build
index 6d20922..d9ac3da 100644
--- a/t/logs/verbose-build
+++ b/t/logs/verbose-build
@@ -132,6 +132,11 @@ Compiling /«BUILDDIR»/emacs23-23.4+1/debian/build-x/src/../lisp/international/
 Compiling '/«PKGBUILDDIR»/debian/tmp/usr/lib/python3.3/_markupbase.py'...
 Compiling /«PKGBUILDDIR»/debian/tmp/usr/lib/python2.7/dist-packages/libsvn/__init__.py ...
 
+# Open MPI compiler wrappers
+[  1%] Building C object packages/zoltan/src/CMakeFiles/trilinos_zoltan.dir/all/all_allo.c.o
+cd /<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/packages/zoltan/src && /usr/bin/mpicc  -Dtrilinos_zoltan_EXPORTS -I/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu -I/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/packages/zoltan/src -I/<<PKGBUILDDIR>>/packages/zoltan/src/include -I/<<PKGBUILDDIR>>/packages/zoltan/src/all -I/<<PKGBUILDDIR>>/packages/zoltan/src/coloring -I/<<PKGBUILDDIR>>/packages/zoltan/src/graph -I/<<PKGBUILDDIR>>/packages/zoltan/src/ha -I/<<PKGBUILDDIR>>/packages/zoltan/src/hier -I/<<PKGBUILDDIR>>/packages/zoltan/src/hsfc -I/<<PKGBUILDDIR>>/packages/zoltan/src/lb -I/<<PKGBUILDDIR>>/packages/zoltan/src/matrix -I/<<PKGBUILDDIR>>/packages/zoltan/src/order -I/<<PKGBUILDDIR>>/packages/zoltan/src/par -I/<<PKGBUILDDIR>>/packages/zoltan/src/params -I/<<PKGBUILDDIR>>/packages/zoltan/src/tpls -I/<<PKGBUILDDIR>>/packages/zoltan/src/phg -I/<<PKGBUILDDIR>>/packages/zoltan/src/rcb -I/<<PKGBUILDDIR>>/packages/zoltan/src/reftree -I/<<PKGBUILDDIR>>/packages/zoltan/src/simple -I/<<PKGBUILDDIR>>/packages/zoltan/src/timer -I/<<PKGBUILDDIR>>/packages/zoltan/src/Utilities/Communication -I/<<PKGBUILDDIR>>/packages/zoltan/src/Utilities/DDirectory -I/<<PKGBUILDDIR>>/packages/zoltan/src/Utilities/Timer -I/<<PKGBUILDDIR>>/packages/zoltan/src/Utilities/shared -I/<<PKGBUILDDIR>>/packages/zoltan/src/zz  -g -O2 -fdebug-prefix-map=/<<PKGBUILDDIR>>=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC   -o CMakeFiles/trilinos_zoltan.dir/all/all_allo.c.o   -c /<<PKGBUILDDIR>>/packages/zoltan/src/all/all_allo.c
+[  1%] Building CXX object packages/kokkos/core/src/CMakeFiles/trilinos_kokkoscore.dir/impl/Kokkos_Profiling_Interface.cpp.o
+cd /<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/packages/kokkos/core/src && /usr/bin/mpicxx   -Dtrilinos_kokkoscore_EXPORTS -I/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu -I/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/packages/kokkos/core/src -I/<<PKGBUILDDIR>>/packages/kokkos/core/src  -g -O2 -fdebug-prefix-map=/<<PKGBUILDDIR>>=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -std=c++11 -fPIC   -o CMakeFiles/trilinos_kokkoscore.dir/impl/Kokkos_Profiling_Interface.cpp.o -c /<<PKGBUILDDIR>>/packages/kokkos/core/src/impl/Kokkos_Profiling_Interface.cpp
 
 # More examples for real build logs.
 Scanning dependencies of target dcmtk_getscu
-- 
2.43.2