From patchwork Mon Feb 5 11:26:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Lyon X-Patchwork-Id: 196750 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp809809dyb; Mon, 5 Feb 2024 03:27:46 -0800 (PST) X-Google-Smtp-Source: AGHT+IF1fJ93BSmuWSdBo97FCzBwEIgLPAOGzqJvzc36ONHD7gbqxyi/vmxUMughmeMtpAGtjtA+ X-Received: by 2002:a05:622a:49:b0:42c:2dd4:3ef6 with SMTP id y9-20020a05622a004900b0042c2dd43ef6mr749831qtw.12.1707132466344; Mon, 05 Feb 2024 03:27:46 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707132466; cv=pass; d=google.com; s=arc-20160816; b=WMj0YDY0GTd6irKzDlDufdhePlO8CTej2KmyDUGRHX2tfEkM8SvhstntWPTFP/gRhf SIglRw51gdyN2wi5gcwdFwiqXit6JS8ENBj4RdIK+tasQtNaednJGigJTzn3CuGZQXHM 7mEyCW9Vd0O1cu3KnwJl3k3UsgPzLrJvJ9kWdmNzV6ZeagWy0K7usMwfQttES6+wyjiW uFz621v13OtUS5aKp5qfz8FL23vTkryDTdn/VRnOB21s1ZT1GQAvkqK2LhaPGc9WO6Sk OLpdJLIkdv0vJKcb0leQHiVdfcvzfGXAwuv4Y/K057uADFu446mvi1w//edDbXaiqawP nTLg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature:arc-filter:dmarc-filter:delivered-to; bh=JsjSsSj8oKeK7nB/jIMuHIhCNft47wpgJjlDbjsOmgM=; fh=49j0kpGaxkyC3+AkS9UFOLeP5OWWJk5yw+/p5xCzkFI=; b=t04ZarZYj9rMrh+QECFWm91xnPiuBFGCl1Tzxu1IJqMxrKs/Ogyl3wxoXJBv5KDkDM rEJjJoypjNCalYwPn0S8+/EHUL0qg2jWTiwuv40VT+tiv2HuuV13RVb3XGS5KKzVj4dc iQd4w5pNJhDL/3a1M52MXGLOfDvgL1KfzXDn2CByDA1rUcOxzEfQC/y5B0bj5ahFth0M 9tC8XsOi1LucDle8hf/08ieWmHDh/1dztld5ad+frhwFNz6zA/0ekHMbMEWdULm3EJNM tE9fWS5h71MuUEpc6Dn+AOsKFMj56LmIWz8MKlQtKBl4irznrEZu4YyC22404j/UwKwi SJcA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UZUyXWho; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org X-Forwarded-Encrypted: i=1; AJvYcCVpp9CjP9XDGxUWI7SudHDmpdYbAXliVz6MA5BWC1elK8r/h6Hv5Ngau5s5MhX5MqJ1imTny3aeQSTGiu7fwz3F/vRnmw== Received: from server2.sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id y7-20020ae9f407000000b00785752e8691si4090507qkl.296.2024.02.05.03.27.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Feb 2024 03:27:46 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UZUyXWho; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1413E3858000 for ; Mon, 5 Feb 2024 11:27:46 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-oi1-x236.google.com (mail-oi1-x236.google.com [IPv6:2607:f8b0:4864:20::236]) by sourceware.org (Postfix) with ESMTPS id 1433F3858C5E for ; Mon, 5 Feb 2024 11:27:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1433F3858C5E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 1433F3858C5E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::236 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707132430; cv=none; b=s5bXLjgV48J0WiGT+ERRYns6bfGIbIA9TqJ80n+dm8NK0/0EKp1gTTHuCIe+ZuRLSaMaV4c3/pnl8Snc/Oy2Q8nyjO6YST4hZOADUNwNXkD7CAASIHhRFauz2EcDKh4FbP2vVpbErVzYifDA8ei2J7C1uzIQztoV5NGD0V6S0ZU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707132430; c=relaxed/simple; bh=3cN2mRg2EEnXLmOqwyTPGyAW1JaDaqkedQUIVKCAFec=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=x/1uS0lzlvIXQhzAvrd8O8DBhobOpJFOAxWtqxldPG1PrnIAJG3qw1AbeKKPrfiYA/69Pbjcbfp9afkAkHGCkC2NIuVIeyrttTX3sAPURnYeW6Kab9iPn9FGgqlutlF/8T1xIyy7uvO9qryb7uYWquUMuXneD4nwEtlVz2mHVhw= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-oi1-x236.google.com with SMTP id 5614622812f47-3bbd6ea06f5so1720980b6e.1 for ; Mon, 05 Feb 2024 03:27:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1707132427; x=1707737227; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JsjSsSj8oKeK7nB/jIMuHIhCNft47wpgJjlDbjsOmgM=; b=UZUyXWhoX+Nf59Q9W+d1VzxqCr+4GFTrcqWO/wboNE2VkGlPHYFBj7ahJEBvP9pJcY obqTm2gHjcnJ++I3H44VLx1llx7XF1oYVLM6rKV1BgeQyM2p3hsdaPEsLXocj+OIeU8A LMDkKm4A+6ycBpGxh4+9MKD9IBYIpk/3EgqMTSKiNLedPnZxsxHby1NAo/lT2HWuxsix QsBBAktkH64dYvlZheCf9Nty3jmjSAZ7uqeQlmgh1XpxrEFr9XjQATsDZ98cAKNh71DM dMjHFEKnRe1GHkwGmVwDyrGaKRXLtIP3MauLtd3cCbnq7kfFMj08647GhLsDYhg5yIGF PGcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707132427; x=1707737227; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JsjSsSj8oKeK7nB/jIMuHIhCNft47wpgJjlDbjsOmgM=; b=s5pVNPbsL6WcCbBhmVFuHgryRV6bpzC1a2twVYBD0cli6Hs1E4xI9eFogzJk3z8DWw uoczdubG06dzpp1zQyrOr0dnwwGzN7DgK2rKpHvjaz2hiRHASrTBBGhN35uPPy+3iAQv ZwSF6SYWTf0yVhDY7ob6BVPhkdgf6BtvOkEDoxqw9l/NGX8UpY5fZx6Wqz6wewRFsOXu H8yzteP9O2h8SfMdTXE5o4Kgd5Ldr5V7Na7IUTIU94YzWnvhGO5ALpYbeGoNnbIj2D5C Wwad4jpJ+bIdhGtVp5kFq3VHrZwPQHyibNxqAARV/apG7zvrMRHZGNi3kk2NAGqskZk1 WDOA== X-Gm-Message-State: AOJu0YwMaWsdw8vOSJwNOzfwelumjlYW1qLWNPMxP2QM8C2QtXh1+LQa FZjrorwwIkM+YoGjM3ryRbkKhQN0LYccc8g4KMzTV67Hglxgoy5xsNfPEN/D1dcBTMJ8TiUwRhX vwcE= X-Received: by 2002:a05:6808:1810:b0:3bf:c0c3:e0dc with SMTP id bh16-20020a056808181000b003bfc0c3e0dcmr2695816oib.12.1707132426853; Mon, 05 Feb 2024 03:27:06 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCWV5fuZjpi8YwKrvtfGOl4nPyT5TbthBgEJk8cMoTGehzO9R3fgFzbp21Wxzb2mYRFsQS53+V4X/2cd4jIN679Z2pRL7zVxgmakzynIlE0GSW/7+gVa2w== Received: from localhost.localdomain ([139.178.84.207]) by smtp.gmail.com with ESMTPSA id a13-20020aca1a0d000000b003bd9d905268sm1417666oia.24.2024.02.05.03.27.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Feb 2024 03:27:06 -0800 (PST) From: Christophe Lyon To: gcc-patches@gcc.gnu.org, oliva@adacore.com, josmyers@redhat.com Cc: Christophe Lyon Subject: [PATCH] gcc/Makefile.in: Fix install-info target if BUILD_INFO is empty Date: Mon, 5 Feb 2024 11:26:52 +0000 Message-Id: <20240205112652.687934-1-christophe.lyon@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790058133387042899 X-GMAIL-MSGID: 1790058133387042899 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 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