From patchwork Sat Dec 30 21:21:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 83047 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 756B93858417 for ; Sat, 30 Dec 2023 21:21:48 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta036.useast.a.cloudfilter.net (omta036.useast.a.cloudfilter.net [44.202.169.35]) by sourceware.org (Postfix) with ESMTPS id EA5A63858C42 for ; Sat, 30 Dec 2023 21:21:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EA5A63858C42 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org EA5A63858C42 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=44.202.169.35 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703971283; cv=none; b=gQTQO0A18cEefhhsHdS6xNyF6CxKKHAilycVIOd3qkZAlTqL6Pgjr5EJde0C/uAI17OhaJaTkuOfaiW5r6LjM6u5B1S5V1MXu8tt/FG/8ST5qKjdUHbLt6dgQEOXy4rDEud4XnLCqZ8MRNY37RJ6jUXOalbpt5s5BraWVHIK4kM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703971283; c=relaxed/simple; bh=vOlcXUKqykFDX/EOpvUwnxpjHyzESG5gdNF4pzIf4AE=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=RvWUIjt1JrsB31PhLjckU5D5wQP6ApLuPFewFYTOxYQBOl/MXZPCkmnlqpxbGfoVQny2AAsVYofgYXwFoYO7+X7gCPHhuHuLdoXn41wnKW59QAADeCJkjy3oAgBuUMJxY+j6cFUq6SgsuU4hbTHC5DOp+jBQDkQ/bwnW3vHrlPo= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-6008a.ext.cloudfilter.net ([10.0.30.227]) by cmsmtp with ESMTPS id JeLTrJssNgpyEJglirlCMU; Sat, 30 Dec 2023 21:21:18 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id JglhrGf3u0xkrJglhr0alj; Sat, 30 Dec 2023 21:21:18 +0000 X-Authority-Analysis: v=2.4 cv=N7U6qkxB c=1 sm=1 tr=0 ts=659089ce a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=OWjo9vPv0XrRhIrVQ50Ab3nP57M=:19 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=e2cXIFwxEfEA:10 a=Qbun_eYptAEA:10 a=zstS-IiYAAAA:8 a=rO2kgNWSz-6pGrCqf7gA:9 a=4G6NA9xxw8l3yy4pmD5M:22 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:Message-ID:Date:Subject: Cc:To:From:Sender:Reply-To:Content-Type:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=2hycE837JgEoRJA297n4Jf9lgLeOMA6//qCYuwxX6EY=; b=Y5lPt0jgKPthp0CwZTvFho0gS1 3CPgkjJCNnK/8urFjhn22tk5SaP5akjnJ0PI+eYBNepdvCBR4+QPjiZIwqFEmnqisC9zogvMy+0kd kqNCCia4zCw7phayXgqk1WLKn; Received: from 71-211-161-25.hlrn.qwest.net ([71.211.161.25]:52858 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96.2) (envelope-from ) id 1rJglh-000HOz-10; Sat, 30 Dec 2023 14:21:17 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: gcc-patches@gcc.gnu.org, Tom Tromey Subject: [PATCH] Pass GUILE down to subdirectories Date: Sat, 30 Dec 2023 14:21:03 -0700 Message-ID: <20231230212103.973170-1-tom@tromey.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 71.211.161.25 X-Source-L: No X-Exim-ID: 1rJglh-000HOz-10 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 71-211-161-25.hlrn.qwest.net (localhost.localdomain) [71.211.161.25]:52858 X-Source-Auth: tom+tromey.com X-Email-Count: 2 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfICF80kE6C43YJl16838sT+FLtU2DHQybpiFtV7hnp1dwoLXc5j8xD7WpTmuK/jqEphKruEjP7NcVoGPI31yN1hTG7QcHN1+LvHIIoAleIAqmnQrr7TX 69CWxZK1MDNCyP5lv4IGr0mmur/TI7EslWylvddU7NCjBMyPeWkEWq/qiUD++gdll/C/MXCprXIIksd8k8AIn4XZ+1qmguqTJso= X-Spam-Status: No, score=-3022.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, 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: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org When I enable cgen rebuilding in the binutils-gdb tree, the default is to run cgen using 'guile'. However, on my host, guile is guile 2.2, which doesn't work for me -- I have to use guile3.0. This patch arranges to pass "GUILE" down to subdirectories, so I can use 'make GUILE=guile3.0'. ChangeLog 2023-12-30 Tom Tromey * Makefile.in: Rebuild. * Makefile.tpl (BASE_EXPORTS): Add GUILE. (GUILE): New variable. * Makefile.def (flags_to_pass): Add GUILE. --- ChangeLog | 7 +++++++ Makefile.def | 1 + Makefile.in | 8 ++++++-- Makefile.tpl | 7 +++++-- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/Makefile.def b/Makefile.def index 662e50fdc18..792919e561c 100644 --- a/Makefile.def +++ b/Makefile.def @@ -310,6 +310,7 @@ flags_to_pass = { flag= GNATBIND ; }; flags_to_pass = { flag= GNATMAKE ; }; flags_to_pass = { flag= GDC ; }; flags_to_pass = { flag= GDCFLAGS ; }; +flags_to_pass = { flag= GUILE ; }; // Target tools flags_to_pass = { flag= AR_FOR_TARGET ; }; diff --git a/Makefile.in b/Makefile.in index 48320bb549e..9a58d5a4f20 100644 --- a/Makefile.in +++ b/Makefile.in @@ -3,7 +3,7 @@ # # Makefile for directory with subdirs to build. # Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, -# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2023 # Free Software Foundation # # This file is free software; you can redistribute it and/or modify @@ -143,7 +143,8 @@ BASE_EXPORTS = \ M4="$(M4)"; export M4; \ SED="$(SED)"; export SED; \ AWK="$(AWK)"; export AWK; \ - MAKEINFO="$(MAKEINFO)"; export MAKEINFO; + MAKEINFO="$(MAKEINFO)"; export MAKEINFO; \ + GUILE="$(GUILE)"; export GUILE; # This is the list of variables to export in the environment when # configuring subdirectories for the build system. @@ -450,6 +451,8 @@ GM2FLAGS = $(CFLAGS) PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +GUILE = guile + # Pass additional PGO and LTO compiler options to the PGO build. BUILD_CFLAGS = $(PGO_BUILD_CFLAGS) $(PGO_BUILD_LTO_CFLAGS) override CFLAGS += $(BUILD_CFLAGS) @@ -878,6 +881,7 @@ BASE_FLAGS_TO_PASS = \ "GNATMAKE=$(GNATMAKE)" \ "GDC=$(GDC)" \ "GDCFLAGS=$(GDCFLAGS)" \ + "GUILE=$(GUILE)" \ "AR_FOR_TARGET=$(AR_FOR_TARGET)" \ "AS_FOR_TARGET=$(AS_FOR_TARGET)" \ "CC_FOR_TARGET=$(CC_FOR_TARGET)" \ diff --git a/Makefile.tpl b/Makefile.tpl index 36fa20950d4..17e585df541 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -6,7 +6,7 @@ in # # Makefile for directory with subdirs to build. # Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, -# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2023 # Free Software Foundation # # This file is free software; you can redistribute it and/or modify @@ -146,7 +146,8 @@ BASE_EXPORTS = \ M4="$(M4)"; export M4; \ SED="$(SED)"; export SED; \ AWK="$(AWK)"; export AWK; \ - MAKEINFO="$(MAKEINFO)"; export MAKEINFO; + MAKEINFO="$(MAKEINFO)"; export MAKEINFO; \ + GUILE="$(GUILE)"; export GUILE; # This is the list of variables to export in the environment when # configuring subdirectories for the build system. @@ -453,6 +454,8 @@ GM2FLAGS = $(CFLAGS) PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +GUILE = guile + # Pass additional PGO and LTO compiler options to the PGO build. BUILD_CFLAGS = $(PGO_BUILD_CFLAGS) $(PGO_BUILD_LTO_CFLAGS) override CFLAGS += $(BUILD_CFLAGS)