From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id NOQmIG8Gr2XtmQQAWB0awg (envelope-from ) for ; Mon, 22 Jan 2024 19:21:03 -0500 Authentication-Results: simark.ca; dkim=fail reason="signature verification failed" (768-bit key; unprotected) header.d=tromey.com header.i=@tromey.com header.a=rsa-sha256 header.s=default header.b=AGfKAY0+; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 70C8D1E0C3; Mon, 22 Jan 2024 19:21:03 -0500 (EST) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 57B761E098 for ; Mon, 22 Jan 2024 19:21:01 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C5CC6385842D for ; Tue, 23 Jan 2024 00:21:00 +0000 (GMT) Received: from omta040.useast.a.cloudfilter.net (omta040.useast.a.cloudfilter.net [44.202.169.39]) by sourceware.org (Postfix) with ESMTPS id ECC4B3858D32 for ; Tue, 23 Jan 2024 00:19:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org ECC4B3858D32 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 ECC4B3858D32 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=44.202.169.39 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705969226; cv=none; b=NAciAgs/N31oxFNTkg4JLYcyQwM3nGo1D8y3oxT5bZ6Eg9g+IRJtT0knGXSi1/hKkDaOIhSnIk1cGY1VuwN7bVgNojfbblQrZn6jlo0wFZWmk0reSlKQJKChHfg2aRt1Zxs6lQ3kOYa3uAZu0TRJ0t26ftweb3AtjdPGIg3DkEk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705969226; c=relaxed/simple; bh=4cKHXELT2w30nty8TMq3p6aQhiZ/tYmI+Iba+eBjTvY=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=WU74MrkW3VM/bm2LVaNgRb9NpPzY/UKUN1lr43bKtWs1mw7VrH/+nonDJpYv9a7tkN5WxxNfSuQqVIg6ywElmFqnAXPGAPL4ZtLlprBDq2vK7aXFLlNKfARFb3jLbK9fWIOgeg9f0+qPVdzmiKiS5/Nmvwq5oYttg5PFYeHQrfU= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-6002a.ext.cloudfilter.net ([10.0.30.222]) by cmsmtp with ESMTPS id RwtSrmiZATHHuS4VsrgSIS; Tue, 23 Jan 2024 00:19:36 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id S4VrrCUPvD6lhS4Vsrs7tr; Tue, 23 Jan 2024 00:19:36 +0000 X-Authority-Analysis: v=2.4 cv=LNR1/ba9 c=1 sm=1 tr=0 ts=65af0618 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dEuoMetlWLkA:10 a=Qbun_eYptAEA:10 a=LQkeXghegzqIkTuooEAA:9 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=hU7zfI9T3fbAivPTpwUEtkB5fEL5bzbqlIJNtzqE/c4=; b=AGfKAY0+2iACET0XRolCVe0MzG fXN4dr2CbEHTpYhzBOhxz1PKhHX4yGuWvwcEZSNcMeAQ7sRWCortcEpGR2xRcVm/5YzD8BSsPdzGW ivN7eBjk1LpE/qJofn+pUyWri; Received: from [161.98.8.3] (port=35428 helo=prentzel.ci.boulder.co.us) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96.2) (envelope-from ) id 1rS4Vr-003Gf5-0q; Mon, 22 Jan 2024 17:19:35 -0700 From: Tom Tromey To: gcc-patches@gcc.gnu.org Cc: gdb-patches@sourceware.org, Andrew Burgess , Tom Tromey Subject: [PATCH] Revert "Pass GUILE down to subdirectories" Date: Mon, 22 Jan 2024 17:19:28 -0700 Message-ID: <20240123001928.787780-1-tom@tromey.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: 161.98.8.3 X-Source-L: No X-Exim-ID: 1rS4Vr-003Gf5-0q X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: (prentzel.ci.boulder.co.us) [161.98.8.3]:35428 X-Source-Auth: tom+tromey.com X-Email-Count: 8 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfCWmkCsQN2lH4vL3tFFZPCBE5NeHqunuaBUdv4z7aA9RnlfXYI+B20fA/XcH03fnYCW+3SnynVNxLx3eqDVtWNXs7L2tRQOtJQYKAsrmg18f93mFm23a wP3qc6qxGi/otT2Zy7URpIrnAbJPF4zddhVOnzMebS0mc12OaDJsDkivpbGpm0gXGv+ridpzDK2aHnKhpwfyJFxVNEmWUJZx3no= X-Spam-Status: No, score=-3022.5 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+public-inbox=simark.ca@sourceware.org This reverts commit b7e5a29602143b53267efcd9c8d5ecc78cd5a62f. This patch caused problems for some users when building gdb, because it would cause 'guild' to be invoked with the wrong versin of guile. On the whole it seems simpler to just back this out. * Makefile.in: Rebuild. * Makefile.tpl (BASE_EXPORTS): Remove GUILE. (GUILE): Remove. * Makefile.def (flags_to_pass): Remove GUILE. --- Makefile.def | 1 - Makefile.in | 8 ++------ Makefile.tpl | 7 ++----- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/Makefile.def b/Makefile.def index 19954e7d731..c8c80af3657 100644 --- a/Makefile.def +++ b/Makefile.def @@ -312,7 +312,6 @@ 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 edb0c8a9a42..245dd610b53 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, 2023 +# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 # Free Software Foundation # # This file is free software; you can redistribute it and/or modify @@ -143,8 +143,7 @@ BASE_EXPORTS = \ M4="$(M4)"; export M4; \ SED="$(SED)"; export SED; \ AWK="$(AWK)"; export AWK; \ - MAKEINFO="$(MAKEINFO)"; export MAKEINFO; \ - GUILE="$(GUILE)"; export GUILE; + MAKEINFO="$(MAKEINFO)"; export MAKEINFO; # This is the list of variables to export in the environment when # configuring subdirectories for the build system. @@ -452,8 +451,6 @@ 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) @@ -886,7 +883,6 @@ 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 adbcbdd1d57..6e22adecd2f 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, 2023 +# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 # Free Software Foundation # # This file is free software; you can redistribute it and/or modify @@ -146,8 +146,7 @@ BASE_EXPORTS = \ M4="$(M4)"; export M4; \ SED="$(SED)"; export SED; \ AWK="$(AWK)"; export AWK; \ - MAKEINFO="$(MAKEINFO)"; export MAKEINFO; \ - GUILE="$(GUILE)"; export GUILE; + MAKEINFO="$(MAKEINFO)"; export MAKEINFO; # This is the list of variables to export in the environment when # configuring subdirectories for the build system. @@ -455,8 +454,6 @@ 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) -- 2.43.0