From e96366dcda86bb862ab78e42aaab3343e6c09ead Mon Sep 17 00:00:00 2001
From: Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org>
Date: Thu, 8 Jul 2021 19:02:39 +0000
Subject: round-robin.sh: Fix cross-testing of GCC

Change-Id: I201f9510fdb1661862fbe2d492d0c46ce0952fb6
---
 round-robin.sh | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/round-robin.sh b/round-robin.sh
index 0b105581..745c5e00 100644
--- a/round-robin.sh
+++ b/round-robin.sh
@@ -386,13 +386,15 @@ build_abe ()
     # to do on a check step.
     if ! $check; then
 	set +f; rm -rf builds/*/*/$project-*; set -f
-    fi
 
-    if [ x"$project" = x"gcc" ] && [ -d builds/destdir ]; then
-	# Delete previously-built GCC so that we avoid using it in native
-	# builds.  Otherwise, when we are bisecting GCC bootstrap failure,
-	# we could use broken GCC.
-	find builds/destdir -path "*/bin/*gcc" -o -path "*/bin/*g++" -delete
+	if [ x"$project" = x"gcc" ] && [ -d builds/destdir ]; then
+	    # Delete previously-built GCC so that we avoid using it in native
+	    # builds.  Otherwise, when we are bisecting GCC bootstrap failure,
+	    # we could use broken GCC.
+	    find builds/destdir \
+		 \( -path "*/bin/*gcc" -o -path "*/bin/*g++" \
+		 -o -path "*/bin/*cpp" -o -path "*/bin/*c++" \) -delete
+	fi
     fi
 
     PATH=$(pwd)/bin:$PATH
-- 
cgit v1.2.3