From f19608d1dea88693a8b67c873cadded14e242ca9 Mon Sep 17 00:00:00 2001
From: Andrey Lushnikov <aslushnikov@gmail.com>
Date: Thu, 28 Oct 2021 13:42:18 -0700
Subject: [PATCH] devops: use `mach clobber` for clearing ff builds (#9864)

Clobbering is required when switching between native intel compilation
and firefox arm cross-compilation.
---
 browser_patches/firefox-beta/clean.sh | 4 +++-
 browser_patches/firefox/clean.sh      | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/browser_patches/firefox-beta/clean.sh b/browser_patches/firefox-beta/clean.sh
index 6dbb181ac9..468c5024df 100755
--- a/browser_patches/firefox-beta/clean.sh
+++ b/browser_patches/firefox-beta/clean.sh
@@ -7,7 +7,6 @@ if [[ ! -z "${FF_CHECKOUT_PATH}" ]]; then
   cd "${FF_CHECKOUT_PATH}"
   echo "WARNING: checkout path from FF_CHECKOUT_PATH env: ${FF_CHECKOUT_PATH}"
 else
-  cd "$(dirname "$0")"
   cd "$HOME/firefox"
 fi
 
@@ -16,3 +15,6 @@ if [[ -d $OBJ_FOLDER ]]; then
   rm -rf $OBJ_FOLDER
 fi
 
+if [[ -f "mach" ]]; then
+  ./mach clobber
+fi
diff --git a/browser_patches/firefox/clean.sh b/browser_patches/firefox/clean.sh
index 907d7ceec9..468c5024df 100755
--- a/browser_patches/firefox/clean.sh
+++ b/browser_patches/firefox/clean.sh
@@ -15,3 +15,6 @@ if [[ -d $OBJ_FOLDER ]]; then
   rm -rf $OBJ_FOLDER
 fi
 
+if [[ -f "mach" ]]; then
+  ./mach clobber
+fi