From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 AEC873858D38 for ; Thu, 30 Mar 2023 21:55:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AEC873858D38 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680213327; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rPSY5hm1Sybn2B8Cl7GU6GT+QSrzB2Ivtmm6hDvmRvo=; b=aXZEV/z3uwdkt0ceK77OdqFIpIGslHadk0KgwU6BzsYppwRawsY2FdPhfpYuB+GeghnsJF cBm4AKtyRTaevmZC7W3kvy/vNII6wpH4ii5a8yMGlkH75bUg0UNIth1pHGPNwEhjlHyPRw /o22/zsWgebkoFkxv1xTtfOqkgyGIkc= Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-614-qDd50vlJOtWYrNjTb2PsNg-1; Thu, 30 Mar 2023 17:55:25 -0400 X-MC-Unique: qDd50vlJOtWYrNjTb2PsNg-1 Received: by mail-qt1-f200.google.com with SMTP id v10-20020a05622a130a00b003e4ee70e001so7329711qtk.6 for ; Thu, 30 Mar 2023 14:55:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680213325; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=rPSY5hm1Sybn2B8Cl7GU6GT+QSrzB2Ivtmm6hDvmRvo=; b=7ZDem0/vbcNMuOnDuWzHz7mYbDaBB9AjwU+TBbFZCwNkEoaZYch+wZ+RjoLEBgDjIG Um4i144R/XPQH1MjVFHOfUrgwIlin60vty3gjuoZxPVi2nX+A3fcxolEeItEt/c3f3rA h5fNQ+/xy8MNHYX8CAvWw4iOnuvUy4uBCflshRaoS9Omn//xKtRCgncWSD4L2DclPbpF 3WMKKYcCQ1Q5XL+3wnPMvCM8/EClVkG91KAyoEzx5qtsdXJz+yjvA/9T74WN69+daeqb jZJh5+7Ly7L43daa+g0JbRgl5lYs/sYoGQPRF2ODTd7WptsQ33XJDkciJUS8No7pvA0q d1sA== X-Gm-Message-State: AO0yUKVDiDqnrPCUuV4/a6ktw94nWX7btMj35/Llb8qGrCxWhTB4YEGw /0+v/AOTSL5jS7M4zRKKomUIXoyUgML9fYPwJx0Hf1JAsTOFx2msqbqLnuzEUebpq+ZYGAyuVbN Zs7QKDvUhUCSJ8lPgrA== X-Received: by 2002:ac8:7e8d:0:b0:3bd:1a07:2086 with SMTP id w13-20020ac87e8d000000b003bd1a072086mr43472795qtj.36.1680213325518; Thu, 30 Mar 2023 14:55:25 -0700 (PDT) X-Google-Smtp-Source: AK7set/fhTNmBvG4EgCXXpXZxbhOLnz9di5So5JKvMETmVL+45kztv39rV4rm5pJHx7gpmAwJeLoNw== X-Received: by 2002:ac8:7e8d:0:b0:3bd:1a07:2086 with SMTP id w13-20020ac87e8d000000b003bd1a072086mr43472771qtj.36.1680213325204; Thu, 30 Mar 2023 14:55:25 -0700 (PDT) Received: from [192.168.1.108] (130-44-146-16.s12558.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.146.16]) by smtp.gmail.com with ESMTPSA id x200-20020a3763d1000000b00745c4d90aacsm168381qkb.115.2023.03.30.14.55.24 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 30 Mar 2023 14:55:24 -0700 (PDT) Message-ID: <4c8ee410-89bf-1219-ce67-3e80ef81a0d7@redhat.com> Date: Thu, 30 Mar 2023 17:55:23 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.9.0 Subject: Re: [PATCH] c++tools: Fix Makefile to properly clean and rebuild [PR101834] To: Jonathan Wakely , gcc-patches@gcc.gnu.org Cc: Alexandre Oliva , Segher Boessenkool References: <20230330121546.1454231-1-jwakely@redhat.com> From: Jason Merrill In-Reply-To: <20230330121546.1454231-1-jwakely@redhat.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On 3/30/23 08:15, Jonathan Wakely wrote: > Tested with various combinations of 'make clean all' etc. > > OK for trunk? > > And backport to gcc-12 and gcc-11 after some soak time on trunk? OK. > -- >8 -- > > The c++tools makefile doesn't remove progressively more files in each of > mostlyclean, clean, and distclean. Instead, each removes a different set > of files (and some files are not removed by any target). Use > prerequisites so that everything is removed. > > Also, building in the $objdir/c++tools directory doesn't work, because > the INSTALL variable is never set. It works when building from the > top-level because INSTALL is set in the environment when recursively > invoking make for sub-directories. > > c++tools/ChangeLog: > > PR bootstrap/101834 > * Makefile.in (INSTALL): Set variable. > (mostlyclean): Mark as a phony target. > (clean): Add mostlyclean as a prerequisite. > (distclean): Add clean as a prerequisite and remove more files. > (maintainer-clean): Add distclean as a prerequisite. > --- > c++tools/Makefile.in | 12 +++++++----- > 1 file changed, 7 insertions(+), 5 deletions(-) > > diff --git a/c++tools/Makefile.in b/c++tools/Makefile.in > index 56cba090135..77bda3d56dc 100644 > --- a/c++tools/Makefile.in > +++ b/c++tools/Makefile.in > @@ -22,6 +22,7 @@ libexecdir := @libexecdir@ > target_noncanonical := @target_noncanonical@ > gcc_version := $(shell @get_gcc_base_ver@ $(srcdir)/../gcc/BASE-VER) > libexecsubdir := $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version) > +INSTALL := @INSTALL@ > INSTALL_PROGRAM := @INSTALL_PROGRAM@ > INSTALL_STRIP_PROGRAM := $(srcdir)/../install-sh -c -s > AUTOCONF := @AUTOCONF@ > @@ -41,13 +42,14 @@ all:: > mostlyclean:: > rm -f $(MAPPER.O) > > -clean:: > +clean:: mostlyclean > rm -f g++-mapper-server$(exeext) > > -distclean:: > - rm -f config.log config.status config.h > +distclean:: clean > + rm -f config.log config.status config.h config.cache Makefile > + rm -f $(MAPPER.O:%.o=%.d) > > -maintainer-clean:: > +maintainer-clean:: distclean > > install:: > > @@ -132,6 +134,6 @@ config.h: config.status config.h.in > config.status: $(srcdir)/configure $(srcdir)/config.h.in > if test -x $@; then ./$@ -recheck; else $< @configure_args@; fi > > -.PHONY: all check clean distclean maintainer-clean > +.PHONY: all check mostlyclean clean distclean maintainer-clean > > -include $(MAPPER.O:.o=.d)