From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id 0YatBDyrw2UYZxYAWB0awg (envelope-from ) for ; Wed, 07 Feb 2024 11:09:32 -0500 Authentication-Results: simark.ca; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=JGKyX5yS; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 02F111E0C3; Wed, 7 Feb 2024 11:09:32 -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 BE56B1E098 for ; Wed, 7 Feb 2024 11:09:29 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 4BD1A3858012 for ; Wed, 7 Feb 2024 16:09:29 +0000 (GMT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id ACD5A38582BC for ; Wed, 7 Feb 2024 16:09:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org ACD5A38582BC Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org ACD5A38582BC Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707322148; cv=none; b=e+JcCNECfgJYSDgKjRpuZbvH3bTTZhYjIR5OzDLGE6pEm7Oh51MUbNlbo9JeLDvZHz1VElXGIkAk77NgodS9vqWTN3enPdk7SvCLH7sd26Y5hnGjKKvagzJmao6qxFtwhRMPOIKcFXiQWjKZq4sAQxIec8YNzbyyJv0n8pEmwW8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707322148; c=relaxed/simple; bh=k8lN1o8UIaIRrAsw1yaQ3hBkIkHzdOGlgILB6X+gBg8=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=HiPMMKEd/HNmIsp2JHqYjQJg7ZSpoMN05At/yJonI/XScA8EvHELmcyXzYTlxSHUyRSvEwahFg6MvSlNnbfIFFLSHBhsHtFWLDEJa3VfMxuH8PFx96IT99jtf7XMj3QTLI6bNQ9+uCi9RWL0vDyyyvg95SOZlikPh00/jL3mqjY= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1707322145; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=qQ1kibxmZZwChYxhU9/dNQWiRs9olohaPTjuftp22B8=; b=JGKyX5ySfamJkOgXsiBa8AUqaJrUSD064/KUCUSFcw9Fzy0XgSLnauwHpSG4Rv/RGwa3m8 zF/8PqrR5bm7/Ko7+c/gXnr3y7/OGC7apJ9zlwhjtBXOcxt1s09K0eq+FqpLwzoD4lO+ot 1Vk0j/ZLn8v9xgC5WXKfV74kxLLvfzE= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-124-iMb-kyRhP26EFMoYgibOIg-1; Wed, 07 Feb 2024 11:09:04 -0500 X-MC-Unique: iMb-kyRhP26EFMoYgibOIg-1 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-40ef165611fso4761955e9.0 for ; Wed, 07 Feb 2024 08:09:04 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707322142; x=1707926942; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=qQ1kibxmZZwChYxhU9/dNQWiRs9olohaPTjuftp22B8=; b=KgMJdVz/6x5nrPvBcceQBQHvtG6rka2xCIvkiJiVEo964bAA4agS1XtubvJs7mG3NZ a/TAJpef44VEZAfBrLMKdnLGDc3IdLWffXXm6RAwu+LmzuLZKn9/oPoPOSeieI2iX+Dm 1SNlL3ZegxEgL7eE1XcsVHrPm7b+hVRGBGx8/sUsyqbxjFZhLh7NmhtspPENcv1jmRi0 LxVHjw/TCZByM8La3tRIg89X5khzFl3OM6JU3trZzQO94kMYb+5uC9KBoG1JcPJfTrPG 3r8iCpvJjn4uGibkJIIFSPF2Gu7ZYp5J1g8sU1LjwQ0mFYPTpGb9BEvNzmNvexlUesMQ EDaQ== X-Gm-Message-State: AOJu0Yz66oEwfHIBpYixzrtJZjk2ELoNAVsMlmjL1sORJwZQWOrUK2pa 0bRyfVGI2+Q60L4Vy4Pp9dTmmjpwyiCBjOUUraE7KsGiO6/ObBjJSRCvjllAvCeMFHkHBlStYx+ E/sJacGsL3r9y+bD0peb+RMmf4PNWDOSoTm0MSQlRxywWjxGkWKsNTUon4/JDtT7i1ls= X-Received: by 2002:a05:600c:4709:b0:410:1d09:701f with SMTP id v9-20020a05600c470900b004101d09701fmr866989wmo.14.1707322142130; Wed, 07 Feb 2024 08:09:02 -0800 (PST) X-Google-Smtp-Source: AGHT+IF+9Sw2JQAEHKLT0C4NHX9Jt3v0hcCMccxFnt3GX0awbcDq7E66C6G1OIeDCekQqqAFlSUKFw== X-Received: by 2002:a05:600c:4709:b0:410:1d09:701f with SMTP id v9-20020a05600c470900b004101d09701fmr866975wmo.14.1707322141796; Wed, 07 Feb 2024 08:09:01 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCVhz2lU3lr9b+O06AVHOogR7HNyg31R8I7ev0Ff8LaMm6oENcFW7KmWl2uuLRw7Bie2FlzL0/UTA2tk2RP2e66kmgF5JW0nHQ== Received: from localhost (185.223.159.143.dyn.plus.net. [143.159.223.185]) by smtp.gmail.com with ESMTPSA id h18-20020adffa92000000b0033afe6968bfsm1794400wrr.64.2024.02.07.08.09.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Feb 2024 08:09:01 -0800 (PST) From: Andrew Burgess To: Tom Tromey , gcc-patches@gcc.gnu.org Cc: gdb-patches@sourceware.org, Tom Tromey Subject: Re: [PATCH] Revert "Pass GUILE down to subdirectories" In-Reply-To: <20240123001928.787780-1-tom@tromey.com> References: <20240123001928.787780-1-tom@tromey.com> Date: Wed, 07 Feb 2024 16:09:00 +0000 Message-ID: <87bk8s8der.fsf@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, 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 Tom Tromey writes: > 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. Is it going to be possible to merge this with GCC in stage 4? Would be super useful if we could as this is still causing problems. Thanks, Andrew > --- > 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