From 9b9a790be66a5ff397cb7c6dab53051f5a1d9470 Mon Sep 17 00:00:00 2001
From: Darryl Green <darryl.green@arm.com>
Date: Fri, 30 Aug 2019 14:51:55 +0100
Subject: [PATCH] Handle deleting non-existant files on Windows

If we try to delete a non-existant file using del on Windows, as
can happen when running make clean, del will throw an error. Make
the Makefiles more robust by only deleting files if they exist.
---
 library/Makefile       | 4 +++-
 programs/Makefile      | 3 ++-
 programs/fuzz/Makefile | 3 ++-
 tests/Makefile         | 4 +++-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/library/Makefile b/library/Makefile
index 1764b0533..501421fb6 100644
--- a/library/Makefile
+++ b/library/Makefile
@@ -165,5 +165,7 @@ clean:
 ifndef WINDOWS
 	rm -f *.o libmbed* $(OBJS_CRYPTO)
 else
-	del /Q /F *.o libmbed* $(OBJS_CRYPTO)
+	if exist *.o del /Q /F *.o
+	if exist libmbed* del /Q /F libmbed*
+	if exist $(OBJS_CRYPTO) del /Q /F $(OBJS_CRYPTO)
 endif
diff --git a/programs/Makefile b/programs/Makefile
index 589b1b5e8..dce970b96 100644
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -317,7 +317,8 @@ ifndef WINDOWS
 	-rm -f ssl/ssl_pthread_server$(EXEXT)
 	-rm -f test/cpp_dummy_build$(EXEXT)
 else
-	del /S /Q /F *.o *.exe
+	if exist *.o del /Q /F *.o
+	if exist *.exe del /Q /F *.exe
 endif
 	$(MAKE) -C fuzz clean
 
diff --git a/programs/fuzz/Makefile b/programs/fuzz/Makefile
index 83059aa66..5cde090d8 100644
--- a/programs/fuzz/Makefile
+++ b/programs/fuzz/Makefile
@@ -69,5 +69,6 @@ clean:
 ifndef WINDOWS
 	rm -rf $(BINARIES) *.o
 else
-	del /Q /F *.o *.exe
+	if exist *.o del /Q /F *.o
+	if exist *.exe del /Q /F *.exe
 endif
diff --git a/tests/Makefile b/tests/Makefile
index 1c7efe04a..0bed6b191 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -160,7 +160,9 @@ clean:
 ifndef WINDOWS
 	rm -rf $(BINARIES) *.c *.datax TESTS
 else
-	del /Q /F *.c *.exe *.datax
+	if exist *.c del /Q /F *.c
+	if exist *.exe del /Q /F *.exe
+	if exist *.datax del /Q /F *.datax
 ifneq ($(wildcard TESTS/.*),)
 	rmdir /Q /S TESTS
 endif