aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2019-01-23 21:53:29 +0200
committerEli Zaretskii2019-01-23 21:53:29 +0200
commitd39a9692d275b2d168fdbfd94b58b15899fe0027 (patch)
treeb628db27dc791a2a52bd0a258d6bcc3df4beb143 /src
parent3b75c5acd4de3cfbbc4612e01b91fce0fd3ba453 (diff)
downloademacs-d39a9692d275b2d168fdbfd94b58b15899fe0027.tar.gz
emacs-d39a9692d275b2d168fdbfd94b58b15899fe0027.zip
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 <alan@idiocy.org>.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.in13
1 files 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) \
521 $(NOTIFY_LIBS) $(LIB_MATH) $(LIBZ) $(LIBMODULES) $(LIBSYSTEMD_LIBS) \ 521 $(NOTIFY_LIBS) $(LIB_MATH) $(LIBZ) $(LIBMODULES) $(LIBSYSTEMD_LIBS) \
522 $(JSON_LIBS) $(GMP_LIB) 522 $(JSON_LIBS) $(GMP_LIB)
523 523
524## FORCE it so that admin/unidata can decide whether these files 524## FORCE it so that admin/unidata can decide whether these files are
525## are up-to-date. Although since charprop depends on bootstrap-emacs, 525## up-to-date. Although since charprop depends on bootstrap-emacs,
526## and emacs (which recreates bootstrap-emacs) depends on charprop, 526## and emacs depends on charprop, in practice this rule was always run
527## in practice this rule was always run anyway. 527## anyway.
528$(srcdir)/macuvs.h $(lispsource)/international/charprop.el: \ 528$(lispsource)/international/charprop.el: \
529 bootstrap-emacs$(EXEEXT) $(bootstrap_pdmp) FORCE 529 FORCE | bootstrap-emacs$(EXEEXT) $(bootstrap_pdmp)
530 $(MAKE) -C ../admin/unidata all EMACS="../$(bootstrap_exe)" 530 $(MAKE) -C ../admin/unidata all EMACS="../$(bootstrap_exe)"
531 531
532## We require charprop.el to exist before ucs-normalize.el is 532## We require charprop.el to exist before ucs-normalize.el is
@@ -565,7 +565,6 @@ ifeq ($(DUMPING),unexec)
565 cp -f $@ bootstrap-emacs$(EXEEXT) 565 cp -f $@ bootstrap-emacs$(EXEEXT)
566else 566else
567 rm -f $@ && cp -f temacs$(EXEEXT) $@ 567 rm -f $@ && cp -f temacs$(EXEEXT) $@
568 cp -f $@ bootstrap-emacs$(EXEEXT)
569endif 568endif
570 569
571ifeq ($(DUMPING),pdumper) 570ifeq ($(DUMPING),pdumper)