Eli Zaretskii wrote:

> Does the below fix the problem?

It helps, thanks.  I needed to make a similar change in a few other
places, at least for building on Solaris.  I've attached the patch I
ended up with.

I still can't get a clean build, because of

    Checking /export/home/kupfer/src/emacs-git/lisp/leim/quail/japanese.el ...
    Fatal error 11: Segmentation Fault
    Backtrace:
    /export/home/kupfer/src/emacs-git/src/bootstrap-emacs'emacs_backtrace+0x43 [0x5b63f3]
    /export/home/kupfer/src/emacs-git/src/bootstrap-emacs'terminate_due_to_signal+0x8b [0x59c40b]
    /export/home/kupfer/src/emacs-git/src/bootstrap-emacs'0x1b4cfe [0x5b4cfe]
    /export/home/kupfer/src/emacs-git/src/bootstrap-emacs'deliver_thread_signal.constprop.13+0x2a [0x5b4eea]
    /export/home/kupfer/src/emacs-git/src/bootstrap-emacs'handle_sigsegv+0x1f [0x5b4f4f]
    /lib/amd64/libc.so.1'__sighndlr+0x6 [0x7fffbe44ebe6]
    /lib/amd64/libc.so.1'call_user_handler+0x2f1 [0x7fffbe4406b1]
    /export/home/kupfer/src/emacs-git/src/bootstrap-emacs'decode_char+0x3db [0x53804b]
    /export/home/kupfer/src/emacs-git/src/bootstrap-emacs'decode_coding_iso_2022+0x141e [0x544bde]
    /export/home/kupfer/src/emacs-git/src/bootstrap-emacs'decode_coding+0x18f [0x54976f]
    /export/home/kupfer/src/emacs-git/src/bootstrap-emacs'decode_coding_gap+0x15f [0x550f9f]
    /export/home/kupfer/src/emacs-git/src/bootstrap-emacs'Finsert_file_contents+0x11fb [0x5cf5eb]
    ...

I got the same failure building master, so it's not related to HarfBuzz.
I'll follow up about this second failure when I get some time; maybe
next week.

cheers,
mike