From a16074bb09740ac84c1d27bbf6733f4a054100ba Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Sat, 30 Aug 2014 00:36:20 +0300 Subject: [PATCH] build: don't try to generate docs when cross-compiling When cross-compiling don't run the generated bison to update the docs. Reported by Aaro Koskinen. * configure.ac (CROSS_COMPILING): New. * doc/local.mk: Use it. --- THANKS | 1 + configure.ac | 3 +++ doc/local.mk | 8 +++++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/THANKS b/THANKS index 096e5edf..2436f004 100644 --- a/THANKS +++ b/THANKS @@ -1,6 +1,7 @@ Bison was originally written by Robert Corbett. It would not be what it is today without the invaluable help of these people: +Aaro Koskinen aaro.koskinen@iki.fi Аскар Сафин safinaskar@mail.ru Airy Andre Airy.Andre@edf.fr Akim Demaille akim@lrde.epita.fr diff --git a/configure.ac b/configure.ac index 7abe35c9..559b5054 100644 --- a/configure.ac +++ b/configure.ac @@ -237,6 +237,9 @@ case $VALGRIND:$host_os in ;; esac +# Whether we cannot run the compiled bison. +AM_CONDITIONAL([CROSS_COMPILING], [test "$cross_compiling" = yes]) + AM_MISSING_PROG([AUTOM4TE], [autom4te]) # Needed by tests/atlocal.in. AC_SUBST([GCC]) diff --git a/doc/local.mk b/doc/local.mk index c55f941e..e92ea715 100644 --- a/doc/local.mk +++ b/doc/local.mk @@ -85,11 +85,13 @@ doc/refcard.pdf: doc/refcard.tex # repeated builds of bison.help. EXTRA_DIST += $(top_srcdir)/doc/bison.help +if ! CROSS_COMPILING MAINTAINERCLEANFILES += $(top_srcdir)/doc/bison.help $(top_srcdir)/doc/bison.help: src/bison$(EXEEXT) $(AM_V_GEN)src/bison$(EXEEXT) --version >doc/bison.help.tmp $(AM_V_at) src/bison$(EXEEXT) --help >>doc/bison.help.tmp $(AM_V_at)$(top_srcdir)/build-aux/move-if-change doc/bison.help.tmp $@ +endif ! CROSS_COMPILING ## ----------- ## @@ -106,7 +108,11 @@ remove_time_stamp = \ sed 's/^\(\.TH[^"]*"[^"]*"[^"]*\)"[^"]*"/\1/' # Depend on configure to get version number changes. -$(top_srcdir)/doc/bison.1: doc/bison.help doc/bison.x $(top_srcdir)/configure +if ! CROSS_COMPILING +MAN_DEPS = doc/bison.help doc/bison.x $(top_srcdir)/configure +endif + +$(top_srcdir)/doc/bison.1: $(MAN_DEPS) $(AM_V_GEN)$(HELP2MAN) \ --include=$(top_srcdir)/doc/bison.x \ --output=$@.t src/bison$(EXEEXT) -- 2.47.2