From 1554ec2cdd7b3c1630db245d083dee20373abd6e Mon Sep 17 00:00:00 2001 From: Martijn Dekker Date: Sat, 16 Jan 2021 18:32:37 +0100 Subject: [PATCH] libast: Revert conf.sh changes (re: 2e839d87, 3aa01a95) These caused a compilation failure in the generated conftab.c file while compiling on Solaris with gcc. --- src/lib/libast/comp/conf.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/lib/libast/comp/conf.sh b/src/lib/libast/comp/conf.sh index b56182e44..b87eae05a 100644 --- a/src/lib/libast/comp/conf.sh +++ b/src/lib/libast/comp/conf.sh @@ -833,10 +833,7 @@ unsigned int conf[] = { [ -f $tmp.1.e ] || cp $tmp.e $tmp.1.e snl='\ ' - # Extract failing identifiers. Try to isolate compiler errors while eliminating suggestions. - # As of 2021, known to work on: gcc, clang, Solaris Studio cc - sed -n 's/[Dd]id you mean.*//; /[Ww]arning:/ d; /[Ee]rror:/ p; /[Ll]ine [0-9][0-9]*:/ p' $tmp.e | - sed "s/[^_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789][^_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789]*/${snl}/g" | + sed "s/[^_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789][^_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789]*/${snl}/g" $tmp.e | grep '^[_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz][_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789]*$' | sort -u > $tmp.n cmp -s $tmp.n $tmp.p && break