Package: blhc
Version: 0.14+git20240421.5d2c338-2
Followup-For: Bug #1125781

Dear Debian and upstream maintainers,

I'm attaching a patch that I hope should fix this recurring
issue once and forever. It ignores the compiler location and
flags, looking only for the [cg]++ compiler suffix and
CMakeCXXCompilerABI.cpp path.

Hope this helps,
Alex

--
  ⢀⣴⠾⠻⢶⣦⠀
  ⣾⠁⢠⠒⠀⣿⡁   Alex Muntada <[email protected]>
  ⢿⡄⠘⠷⠚⠋   Debian Developer 🍥 log.alexm.org
  ⠈⠳⣄⠀⠀⠀⠀

diff --git a/bin/blhc b/bin/blhc
index f90fd7a..f7e5c17 100755
--- a/bin/blhc
+++ b/bin/blhc
@@ -1151,7 +1151,7 @@ foreach my $file (@ARGV) {
             # Embedded `gcc -print-*` commands
             next if $line =~ /`$cc_regex_normal\s*[^`]*-print-\S+`/;
             # cmake checking for compiler flags without setting CPPFLAGS
-            next if $line =~ m{^\s*/usr/(bin|lib)/(ccache/)?c\+\+ (?:-std=\S+ )?-dM -E -c /usr/share/cmake-\S+/Modules/CMakeCXXCompilerABI\.cpp};
+            next if $line =~ m{[cg]\+\+ (?:.*?)/usr/share/cmake-\S+/Modules/CMakeCXXCompilerABI\.cpp};
             # Some rustc lines look like linker commands
             next if $cargo and $line =~ /$rustc_regex/o;
 

Attachment: signature.asc
Description: PGP signature

Reply via email to