From db0b7d84011e8a094e9ec1b1a1bf94f2b7cd10e3 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Mon, 6 Sep 2021 15:59:44 -0400
Subject: [PATCH] build: Use $rmAttrs and $(RM) in more places instead of 'rm'
 directly.

Should not result in a functional change in most cases, but it might
on some systems without full xattrs or emulation.
---
 build/scripts/build_haiku_package |  2 +-
 src/system/boot/Jamfile           | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build/scripts/build_haiku_package b/build/scripts/build_haiku_package
index 46c1a20a0a..59d6e3c812 100755
--- a/build/scripts/build_haiku_package
+++ b/build/scripts/build_haiku_package
@@ -115,7 +115,7 @@ $mimeset --mimedb "$mimeDB" "$contentsDir"
 # create the package
 if [ ! $updateOnly ]; then
 	echo "$packageName: Creating the package ..."
-	rm -f "$packagePath"
+	$rmAttrs -f "$packagePath"
 	$package create -q "-$compressionLevel" -i "$packageInfoPath" \
 		-C "$contentsDir" "$packagePath"
 else
diff --git a/src/system/boot/Jamfile b/src/system/boot/Jamfile
index 410c7bd0ec..e60554f0d9 100644
--- a/src/system/boot/Jamfile
+++ b/src/system/boot/Jamfile
@@ -37,7 +37,7 @@ rule BuildAoutLoader {
 }
 
 actions BuildAoutLoader bind ELF2AOUT {
-	rm -f $(1)
+	$(RM) -f $(1)
 	$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) \
 	$(ELF2AOUT) -o $(1) $(2)
 }
@@ -61,11 +61,11 @@ rule BuildCoffLoader {
 }
 
 actions BuildCoffLoader bind HACK_COFF {
-	rm -f $(1)
+	$(RM) -f $(1)
 	# get the address of the COFF entry
 	$(TARGET_OBJCOPY_$(TARGET_PACKAGING_ARCH)) -O symbolsrec $(2) $(2).syms
 	EP=`grep _coff_start $(2).syms | tr -d '\r' | cut -d'$' -f2`
-	rm -f $(2).syms
+	$(RM) -f $(2).syms
 	# copy to XCOFF format and patch the entry point
 	$(TARGET_OBJCOPY_$(TARGET_PACKAGING_ARCH)) -O $(COFF_FORMAT) --set-start="0x${EP}" $(2) $(1)
 	#$(CP) $(2) $(1)
@@ -92,7 +92,7 @@ rule BuildBiosLoader {
 }
 
 actions BuildBiosLoader {
-	rm -f $(1)
+	$(RM) -f $(1)
 	$(TARGET_OBJCOPY_$(TARGET_PACKAGING_ARCH)) -O binary $(2) $(1)
 }
 
@@ -124,7 +124,7 @@ rule BuildEFILoader {
 
 actions BuildEFILoader
 {
-	rm -f $(1)
+	$(RM) -f $(1)
 	if [ "$(OUTPUT_TARGET)" = "binary" ]; then
 		# no bfd support, fake efi Pe header
 		$(TARGET_OBJCOPY_$(TARGET_PACKAGING_ARCH)) -j .text -j .sdata -j .data \
@@ -178,7 +178,7 @@ rule BuildUImageScript script : source
 
 actions BuildUImageScript1
 {
-	rm -f $(1)
+	$(RM) -f $(1)
 	mkimage -A $(ARCH) -O $(FAKEOS) -T script -C none -n $(SCRIPTNAME) \
 		-d $(2) $(1)
 }