* [PATCH] Fix PR 110085: `make clean` in GCC directory on sh target causes a failure
@ 2023-06-05 4:41 Andrew Pinski
2023-06-05 5:23 ` Richard Biener
0 siblings, 1 reply; 4+ messages in thread
From: Andrew Pinski @ 2023-06-05 4:41 UTC (permalink / raw)
To: gcc-patches; +Cc: Andrew Pinski
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.
---
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.
--
2.31.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Fix PR 110085: `make clean` in GCC directory on sh target causes a failure
2023-06-05 4:41 [PATCH] Fix PR 110085: `make clean` in GCC directory on sh target causes a failure Andrew Pinski
@ 2023-06-05 5:23 ` Richard Biener
2023-06-05 5:43 ` Andrew Pinski
0 siblings, 1 reply; 4+ messages in thread
From: Richard Biener @ 2023-06-05 5:23 UTC (permalink / raw)
To: Andrew Pinski; +Cc: gcc-patches
> Am 05.06.2023 um 06:42 schrieb Andrew Pinski via Gcc-patches <gcc-patches@gcc.gnu.org>:
>
> 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?
Ok
> gcc/ChangeLog:
>
> PR bootstrap/110085
> * Makefile.in (clean): Remove the removing of
> MULTILIB_DIR/MULTILIB_OPTIONS directories.
> ---
> 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.
> --
> 2.31.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Fix PR 110085: `make clean` in GCC directory on sh target causes a failure
2023-06-05 5:23 ` Richard Biener
@ 2023-06-05 5:43 ` Andrew Pinski
2023-06-05 6:33 ` Richard Biener
0 siblings, 1 reply; 4+ messages in thread
From: Andrew Pinski @ 2023-06-05 5:43 UTC (permalink / raw)
To: Richard Biener; +Cc: Andrew Pinski, gcc-patches
On Sun, Jun 4, 2023 at 10:24 PM Richard Biener via Gcc-patches
<gcc-patches@gcc.gnu.org> wrote:
>
>
>
> > Am 05.06.2023 um 06:42 schrieb Andrew Pinski via Gcc-patches <gcc-patches@gcc.gnu.org>:
> >
> > 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?
>
> Ok
Is a similar patch ok for GCC 13 branch as we would get a similar
failure there too?
Thanks,
Andrew
>
> > gcc/ChangeLog:
> >
> > PR bootstrap/110085
> > * Makefile.in (clean): Remove the removing of
> > MULTILIB_DIR/MULTILIB_OPTIONS directories.
> > ---
> > 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.
> > --
> > 2.31.1
> >
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Fix PR 110085: `make clean` in GCC directory on sh target causes a failure
2023-06-05 5:43 ` Andrew Pinski
@ 2023-06-05 6:33 ` Richard Biener
0 siblings, 0 replies; 4+ messages in thread
From: Richard Biener @ 2023-06-05 6:33 UTC (permalink / raw)
To: Andrew Pinski; +Cc: Andrew Pinski, gcc-patches
On Mon, Jun 5, 2023 at 7:43 AM Andrew Pinski <pinskia@gmail.com> wrote:
>
> On Sun, Jun 4, 2023 at 10:24 PM Richard Biener via Gcc-patches
> <gcc-patches@gcc.gnu.org> wrote:
> >
> >
> >
> > > Am 05.06.2023 um 06:42 schrieb Andrew Pinski via Gcc-patches <gcc-patches@gcc.gnu.org>:
> > >
> > > 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?
> >
> > Ok
>
> Is a similar patch ok for GCC 13 branch as we would get a similar
> failure there too?
Yes, though I wonder if we should worry.
Richard.
> Thanks,
> Andrew
>
> >
> > > gcc/ChangeLog:
> > >
> > > PR bootstrap/110085
> > > * Makefile.in (clean): Remove the removing of
> > > MULTILIB_DIR/MULTILIB_OPTIONS directories.
> > > ---
> > > 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.
> > > --
> > > 2.31.1
> > >
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-06-05 6:33 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-05 4:41 [PATCH] Fix PR 110085: `make clean` in GCC directory on sh target causes a failure Andrew Pinski
2023-06-05 5:23 ` Richard Biener
2023-06-05 5:43 ` Andrew Pinski
2023-06-05 6:33 ` Richard Biener
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).