diff options
| author | Andrew Pinski <apinski@marvell.com> | 2023-06-05 04:32:00 +0000 |
|---|---|---|
| committer | Andrew Pinski <apinski@marvell.com> | 2023-06-05 05:41:24 +0000 |
| commit | afd87299cefd021daf0158d5b6276c37013996b9 (patch) | |
| tree | 85a2db45a4626b359a1c7c15f5fea63ea60f4dc5 | |
| parent | 83c3550ee96aa2d0c964bfb6d0f82428561479fd (diff) | |
| download | gcc-afd87299cefd021daf0158d5b6276c37013996b9.zip gcc-afd87299cefd021daf0158d5b6276c37013996b9.tar.gz gcc-afd87299cefd021daf0158d5b6276c37013996b9.tar.bz2 | |
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.
| -rw-r--r-- | gcc/Makefile.in | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 1d39e6d..0c02f31 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. |