From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1314) id C8EB23857C51; Tue, 6 Jun 2023 21:33:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C8EB23857C51 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1686087223; bh=X6xinaK98KIaBclghHLzCGJvB6JuXV0fwtxsean71Ms=; h=From:To:Subject:Date:From; b=g3qEP6AOQaSCbrm894CCo8mmnRuRu0TRSbIlcCMS8qM/2B2pu18jN+9qYm6qMo1/+ BZQARW2o0O44xmdZn1RQ/lvnXfnF650ZVphR9ZLKIwCTPzm83efP8CUkbfwlOPYx/A 2lmE2476PhiaTnrca+XbzYV6HgfL8TMVXWm1cFSk= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Andrew Pinski To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-7421] Fix PR 110085: `make clean` in GCC directory on sh target causes a failure X-Act-Checkin: gcc X-Git-Author: Andrew Pinski X-Git-Refname: refs/heads/releases/gcc-13 X-Git-Oldrev: c0a57904308ad0f10833f38cb207c750e5658b6b X-Git-Newrev: 044ee48215fd7eca1f1680758cd27574ff274417 Message-Id: <20230606213343.C8EB23857C51@sourceware.org> Date: Tue, 6 Jun 2023 21:33:43 +0000 (GMT) List-Id: https://gcc.gnu.org/g:044ee48215fd7eca1f1680758cd27574ff274417 commit r13-7421-g044ee48215fd7eca1f1680758cd27574ff274417 Author: Andrew Pinski 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. Committed as approved. gcc/ChangeLog: PR bootstrap/110085 * Makefile.in (clean): Remove the removing of MULTILIB_DIR/MULTILIB_OPTIONS directories. (cherry picked from commit afd87299cefd021daf0158d5b6276c37013996b9) Diff: --- gcc/Makefile.in | 7 ------- 1 file changed, 7 deletions(-) diff --git a/gcc/Makefile.in b/gcc/Makefile.in index ad9a5d94cd0..775aaa1b3c4 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -3585,13 +3585,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.