From 618be833ce3b9f1186ece915812115de5f633b66 Mon Sep 17 00:00:00 2001 From: Anna Tikhomirova Date: Tue, 22 Sep 2020 16:09:54 +0300 Subject: [PATCH 1/2] Fix error with GCC 9 --- distccflags | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distccflags b/distccflags index 4bbbaec..2fda64d 100755 --- a/distccflags +++ b/distccflags @@ -59,7 +59,7 @@ fi get_arch() { $CC -Q --help=target "$@" | - egrep '\s*-march=' | + egrep '^\s*-march=' | awk '{print $2}' } From c52809db6d9584e69020273aabd045aebe4011b1 Mon Sep 17 00:00:00 2001 From: Anna Tikhomirova Date: Fri, 1 Dec 2023 04:41:10 +0300 Subject: [PATCH 2/2] Fix grep warnings --- distccflags | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/distccflags b/distccflags index 2fda64d..44b8632 100755 --- a/distccflags +++ b/distccflags @@ -59,14 +59,14 @@ fi get_arch() { $CC -Q --help=target "$@" | - egrep '^\s*-march=' | + grep -E '^\s*-march=' | awk '{print $2}' } gitem() { $CC -Q --help=target "$@" | - egrep '^\s+-m' | - egrep -v '=\s*(\[default\]|)$' | + grep -E '^\s+-m' | + grep -E -v '=\s*(\[default\]|)$' | perl -pe ' s/^\s+-mno-([\w-\.]+)\s+\[enabled\]/$1 no/g; s/^\s+-mno-([\w-\.]+)\s+\[disabled\]/$1/g; @@ -83,7 +83,7 @@ native=$(gitem "$@") needed=$( diff -u0 <(echo "$generic") <(echo "$native") | - grep '^\+' | + grep '^+' | grep -v 'arch=' | perl -pe ' s/^\+\+\+.*$//g;