X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=bin%2Fblhc;h=0e907070bc84100c98771a81bf97a7921216cfa4;hb=bc6e920d8047a414012dd7f7dc152916d0670427;hp=accb99fbff8226aa42fb55ed423a9e32b40d3710;hpb=ec2b4beb8fdc976b98d31c1f2d85db6b59115580;p=blhc%2Fblhc.git

diff --git a/bin/blhc b/bin/blhc
index accb99f..0e90707 100755
--- a/bin/blhc
+++ b/bin/blhc
@@ -2,7 +2,7 @@
 
 # Build log hardening check, checks build logs for missing hardening flags.
 
-# Copyright (C) 2012-2016  Simon Ruderich
+# Copyright (C) 2012-2017  Simon Ruderich
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -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
@@ -618,7 +618,7 @@ if ($option_help) {
 }
 if ($option_version) {
     print <<"EOF";
-blhc $VERSION  Copyright (C) 2012-2016  Simon Ruderich
+blhc $VERSION  Copyright (C) 2012-2017  Simon Ruderich
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -1022,14 +1022,21 @@ foreach my $file (@ARGV) {
 
     # Option or auto detected.
     if ($arch) {
-        # The following was partially copied from dpkg-dev 1.18.10
+        # The following was partially copied from dpkg-dev 1.18.15
         # (/usr/share/perl5/Dpkg/Vendor/Debian.pm, _add_hardening_flags()),
         # copyright Raphaël Hertzog <hertzog@debian.org>, Kees Cook
         # <kees@debian.org>, Canonical, Ltd. licensed under GPL version 2 or
         # later. Keep it in sync.
 
         require Dpkg::Arch;
-        my ($abi, $os, $cpu) = Dpkg::Arch::debarch_to_debtriplet($arch);
+        my ($os, $cpu);
+        # Recent dpkg versions use a quadruplet for arch. Support both.
+        eval {
+            (undef, undef, $os, $cpu) = Dpkg::Arch::debarch_to_debtuple($arch);
+        };
+        if ($@) {
+            (undef, $os, $cpu) = Dpkg::Arch::debarch_to_debtriplet($arch);
+        }
 
         # Disable unsupported hardening options.
         if ($os !~ /^(?:linux|kfreebsd|knetbsd|hurd)$/
@@ -1619,7 +1626,7 @@ E<lt>jari.aalto@cante.netE<gt> for their valuable input and suggestions.
 
 =head1 LICENSE AND COPYRIGHT
 
-Copyright (C) 2012-2016 by Simon Ruderich
+Copyright (C) 2012-2017 by Simon Ruderich
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by