From fbccf8dfc991ba8f90967101028728a0159198d0 Mon Sep 17 00:00:00 2001
From: Jimmy Brisson <theotherjimmy@gmail.com>
Date: Wed, 6 Jul 2016 12:49:38 -0500
Subject: [PATCH] Force shell use when in bash/sh mode

---
 tools/export/gcc_arm_common.tmpl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/export/gcc_arm_common.tmpl b/tools/export/gcc_arm_common.tmpl
index 824434ef04..7ae338913c 100644
--- a/tools/export/gcc_arm_common.tmpl
+++ b/tools/export/gcc_arm_common.tmpl
@@ -4,10 +4,10 @@
 # cross-platform directory manipulation
 ifeq ($(shell echo $$OS),$$OS)
     MAKEDIR = if not exist "$(1)" mkdir "$(1)"
-    RM = rmdir /S /Q
+    RM = rmdir /S /Q "$(1)"
 else
-    MAKEDIR = mkdir -p $(1)
-    RM = rm -rf
+    MAKEDIR = $(SHELL) -c "mkdir -p $(1)"
+    RM = $(SHELL) -c "rm -rf $(1)"
 endif
 
 ifeq (,$(filter .build,$(notdir $(CURDIR))))
@@ -24,7 +24,7 @@ $(OBJDIR): all
 Makefile : ;
 % :: $(OBJDIR) ; :
 clean :
-	$(RM) $(OBJDIR)
+	$(call RM,$(OBJDIR))
 {% block target_clean -%}
 {% endblock %}
 else