1
0
mirror of https://github.com/bebbo/amiga-gcc.git synced 2026-05-03 22:48:46 +00:00

Fix sed problems on some locale-aware platforms

The Amiga files can not be safely sed’d if LC_CTYPE is set to a unicode or multibyte locale (either directly, or indirectly via LANG).  Force the CTYPE to C to allow this to work.  Fixes build issues on macOS.
This commit is contained in:
Chris Collins
2018-05-14 10:01:02 +10:00
parent 4541c0f956
commit 54770e1345

View File

@@ -520,7 +520,7 @@ build/ndk-include/_ndk13: build/ndk-include/_ndk
while read p; do \
mkdir -p $(PREFIX)/m68k-amigaos/ndk13-include/$$(dirname $$p); \
if grep V36 $(PREFIX)/m68k-amigaos/ndk-include/$$p; then \
sed -n -e '/#ifndef CLIB/,/V36/p' $(PREFIX)/m68k-amigaos/ndk-include/$$p >$(PREFIX)/m68k-amigaos/ndk13-include/$$p; \
LC_CTYPE=C sed -n -e '/#ifndef CLIB/,/V36/p' $(PREFIX)/m68k-amigaos/ndk-include/$$p >$(PREFIX)/m68k-amigaos/ndk13-include/$$p; \
echo -e "#ifdef __cplusplus\n}\n#endif /* __cplusplus */\n#endif" >>$(PREFIX)/m68k-amigaos/ndk13-include/$$p; \
else cp $(PREFIX)/m68k-amigaos/ndk-include/$$p $(PREFIX)/m68k-amigaos/ndk13-include/$$p; fi \
done < patches/ndk13/chfiles
@@ -528,7 +528,7 @@ build/ndk-include/_ndk13: build/ndk-include/_ndk
echo '#undef EXECNAME' > $(PREFIX)/m68k-amigaos/ndk13-include/exec/execname.h
echo '#define EXECNAME "exec.library"' >> $(PREFIX)/m68k-amigaos/ndk13-include/exec/execname.h
mkdir -p $(PREFIX)/m68k-amigaos/ndk/lib/fd13
while read p; do sed -n -e '/##base/,/V36/P' $(PREFIX)/m68k-amigaos/ndk/lib/fd/$$p >$(PREFIX)/m68k-amigaos/ndk/lib/fd13/$$p; done < patches/ndk13/fdfiles
while read p; do LC_CTYPE=C sed -n -e '/##base/,/V36/P' $(PREFIX)/m68k-amigaos/ndk/lib/fd/$$p >$(PREFIX)/m68k-amigaos/ndk/lib/fd13/$$p; done < patches/ndk13/fdfiles
mkdir -p $(PREFIX)/m68k-amigaos/ndk/lib/sfd13
for i in $(PREFIX)/m68k-amigaos/ndk/lib/fd13/*; do fd2sfd $$i $(PREFIX)/m68k-amigaos/ndk13-include/clib/$$(basename $$i _lib.fd)_protos.h > $(PREFIX)/m68k-amigaos/ndk/lib/sfd13/$$(basename $$i .fd).sfd; done
for i in $(PREFIX)/m68k-amigaos/ndk/lib/sfd13/*; do \