public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Andrew Pinski <pinskia@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r14-1541] Fix PR 110085: `make clean` in GCC directory on sh target causes a failure
Date: Mon,  5 Jun 2023 05:42:21 +0000 (GMT)	[thread overview]
Message-ID: <20230605054221.6EEE03858C2C@sourceware.org> (raw)

https://gcc.gnu.org/g:afd87299cefd021daf0158d5b6276c37013996b9

commit r14-1541-gafd87299cefd021daf0158d5b6276c37013996b9
Author: Andrew Pinski <apinski@marvell.com>
Date:   Mon Jun 5 04:32:00 2023 +0000

    Fix PR 110085: `make clean` in GCC directory on sh target causes a failure
    
    On sh target, there is a MULTILIB_DIRNAMES (or is it MULTILIB_OPTIONS) named m2,
    this conflicts with the langauge m2. So when you do a `make clean`, it will remove
    the m2 directory and then a build will fail. Now since r0-78222-gfa9585134f6f58,
    the multilib directories are no longer created in the gcc directory as libgcc
    was moved to the toplevel. So we can remove the part of clean that removes those
    directories.
    
    Tested on x86_64-linux-gnu and a cross to sh-elf that `make clean` followed by
    `make` works again.
    
    OK?
    
    gcc/ChangeLog:
    
            PR bootstrap/110085
            * Makefile.in (clean): Remove the removing of
            MULTILIB_DIR/MULTILIB_OPTIONS directories.

Diff:
---
 gcc/Makefile.in | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 1d39e6dd3f8..0c02f312985 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -3622,13 +3622,6 @@ clean: mostlyclean lang.clean
 	-rm -f doc/*.pdf
 # Delete the include directories.
 	-rm -rf include include-fixed
-# Delete files used by the "multilib" facility (including libgcc subdirs).
-	-rm -f multilib.h tmpmultilib*
-	-if [ "x$(MULTILIB_DIRNAMES)" != x ] ; then \
-	  rm -rf $(MULTILIB_DIRNAMES); \
-	else if [ "x$(MULTILIB_OPTIONS)" != x ] ; then \
-	  rm -rf `echo $(MULTILIB_OPTIONS) | sed -e 's/\// /g'`; \
-	fi ; fi
 
 # Delete all files that users would normally create
 # while building and installing GCC.

                 reply	other threads:[~2023-06-05  5:42 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230605054221.6EEE03858C2C@sourceware.org \
    --to=pinskia@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).