From d39a9692d275b2d168fdbfd94b58b15899fe0027 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 23 Jan 2019 21:53:29 +0200 Subject: [PATCH] Fix build errors with pdump fingerprint on macOS * src/Makefile.in ($(lispsource)/international/charprop.el): Remove macuvs.h from the target list, to avoid circular dependency on macOS. Reported by Alan Third . --- src/Makefile.in | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/Makefile.in b/src/Makefile.in index e0b7e3d1ef6..48552908e4f 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -521,12 +521,12 @@ LIBES = $(LIBS) $(W32_LIBS) $(LIBS_GNUSTEP) $(LIBX_BASE) $(LIBIMAGE) \ $(NOTIFY_LIBS) $(LIB_MATH) $(LIBZ) $(LIBMODULES) $(LIBSYSTEMD_LIBS) \ $(JSON_LIBS) $(GMP_LIB) -## FORCE it so that admin/unidata can decide whether these files -## are up-to-date. Although since charprop depends on bootstrap-emacs, -## and emacs (which recreates bootstrap-emacs) depends on charprop, -## in practice this rule was always run anyway. -$(srcdir)/macuvs.h $(lispsource)/international/charprop.el: \ - bootstrap-emacs$(EXEEXT) $(bootstrap_pdmp) FORCE +## FORCE it so that admin/unidata can decide whether these files are +## up-to-date. Although since charprop depends on bootstrap-emacs, +## and emacs depends on charprop, in practice this rule was always run +## anyway. +$(lispsource)/international/charprop.el: \ + FORCE | bootstrap-emacs$(EXEEXT) $(bootstrap_pdmp) $(MAKE) -C ../admin/unidata all EMACS="../$(bootstrap_exe)" ## We require charprop.el to exist before ucs-normalize.el is @@ -565,7 +565,6 @@ ifeq ($(DUMPING),unexec) cp -f $@ bootstrap-emacs$(EXEEXT) else rm -f $@ && cp -f temacs$(EXEEXT) $@ - cp -f $@ bootstrap-emacs$(EXEEXT) endif ifeq ($(DUMPING),pdumper) -- 2.39.5