On Wed, Apr 02, 2025 at 04:24:30PM -0500, Robert Dubner wrote:
> Solutions have been put in place that don't involve modifying the source
> code of the copied files. I haven't made an opportunity to understand how
> they work, but I am choosing to drop the matter.
In order to unbreak Darwin, I've committed following patch after ack from
Richi on IRC.
Feel free to adjust it incrementally.
2025-04-07 Jakub Jelinek <ja...@redhat.com>
* Make-lang.in (cobol/charmaps.cc, cobol/valconv.cc): Use a BRE
only sed regex.
--- gcc/cobol/Make-lang.in.jj 2025-04-07 13:52:19.385557244 +0200
+++ gcc/cobol/Make-lang.in 2025-04-07 14:19:45.178603788 +0200
@@ -90,9 +90,7 @@ cobol1_OBJS = \
# so that the .h files can be found.
cobol/charmaps.cc cobol/valconv.cc: cobol/%.cc: $(LIB_SOURCE)/%.cc
- -l='ec\|common-defs\|io\|gcobolio\|gfileio\|charmaps'; \
- l=$$l'\|valconv\|exceptl'; \
- sed -e '/^#include/s,"\('$$l'\)\.h","../../libgcobol/\1.h",' $^ > $@
+ sed -e '/^#include/s,"\([^"]*[^g"].h\)","../../libgcobol/\1",' $^ > $@
LIB_SOURCE_H=$(wildcard $(LIB_SOURCE)/*.h)
Jakub
