From: Christophe Lyon <christophe.lyon@linaro.org>
To: gcc-patches@gcc.gnu.org, oliva@adacore.com, josmyers@redhat.com
Cc: Christophe Lyon <christophe.lyon@linaro.org>
Subject: [PATCH] gcc/Makefile.in: Fix install-info target if BUILD_INFO is empty
Date: Mon, 5 Feb 2024 11:26:52 +0000 [thread overview]
Message-ID: <20240205112652.687934-1-christophe.lyon@linaro.org> (raw)
In-Reply-To: <CAPS5khYdgj0opOVXxLjWH3EEuXJFGhODPAjN204T4sReCopJaw@mail.gmail.com>
BUILD_INFO is currently a byproduct of checking makeinfo
presence/version. INSTALL_INFO used to be defined similarly, but was
removed in 2000 (!) by commit 17db658241d18cf6db59d31bc2d6eac96e9257df
(svn r38141).
In order to save build time, our CI overrides BUILD_INFO="", which
works when invoking 'make all' but not for 'make install' in case some
info files need an update.
I noticed this when testing a patch posted on the gcc-patches list,
leading to an error at 'make install' time after updating tm.texi (the
build reported 'new text' in tm.texi and stopped). This is because
'install' depends on 'install-info', which depends on
$(DESTDIR)$(infodir)/gccint.info (among others).
This patch makes the 'install-info' dependency in 'install'
conditioned by BUILD_INFO.
2024-02-05 Christophe Lyon <christophe.lyon@linaro.org>
gcc/
* Makefile.in: Use install-info only if BUILD_INFO is not empty.
---
gcc/Makefile.in | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 4d38b162307..6cb564cfd35 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -817,7 +817,6 @@ INSTALL_HEADERS=install-headers install-mkheaders
# Control whether Info documentation is built and installed.
BUILD_INFO = @BUILD_INFO@
-INSTALL_INFO = @INSTALL_INFO@
# Control flags for @contents placement in HTML output
MAKEINFO_TOC_INLINE_FLAG = @MAKEINFO_TOC_INLINE_FLAG@
@@ -3786,9 +3785,13 @@ maintainer-clean:
# Install the driver last so that the window when things are
# broken is small.
install: install-common $(INSTALL_HEADERS) \
- install-cpp install-man $(INSTALL_INFO) install-@POSUB@ \
+ install-cpp install-man install-@POSUB@ \
install-driver install-lto-wrapper install-gcc-ar
+ifneq ($(BUILD_INFO),)
+install: install-info
+endif
+
ifeq ($(enable_plugin),yes)
install: install-plugin
endif
--
2.34.1
next prev parent reply other threads:[~2024-02-05 11:27 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-01 17:15 [PATCH] gcc/configure: Re-introduce INSTALL_INFO Christophe Lyon
2024-02-02 10:10 ` rep.dot.nop
2024-02-02 10:40 ` Christophe Lyon
2024-02-05 11:26 ` Christophe Lyon [this message]
2024-02-06 5:37 ` [PATCH] gcc/Makefile.in: Fix install-info target if BUILD_INFO is empty Alexandre Oliva
2024-02-10 22:06 ` Christophe Lyon
2024-02-11 5:56 ` Alexandre Oliva
2024-02-12 10:13 ` Christophe Lyon
2024-02-12 10:27 ` Jakub Jelinek
2024-02-12 15:48 ` Christophe Lyon
2024-02-05 11:30 ` [PATCH] gcc/configure: Re-introduce INSTALL_INFO Christophe Lyon
2024-02-05 12:25 ` rep.dot.nop
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240205112652.687934-1-christophe.lyon@linaro.org \
--to=christophe.lyon@linaro.org \
--cc=gcc-patches@gcc.gnu.org \
--cc=josmyers@redhat.com \
--cc=oliva@adacore.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).