diff mbox series

[COMMITTED/13] Fix PR 110085: `make clean` in GCC directory on sh target causes a failure

Message ID 20230606213315.2993028-1-apinski@marvell.com
State Committed
Headers
Series [COMMITTED/13] Fix PR 110085: `make clean` in GCC directory on sh target causes a failure |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_gcc_build--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_gcc_build--master-arm success Testing passed

Commit Message

Andrew Pinski June 6, 2023, 9:33 p.m. UTC 
  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)
---
 gcc/Makefile.in | 7 -------
 1 file changed, 7 deletions(-)
diff mbox series

Patch

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.