[Lldb-commits] [lldb] r246062 - On Windows, use 'del' instead of 'rm' to delete the test executable.

Zachary Turner via lldb-commits lldb-commits at lists.llvm.org
Wed Aug 26 12:44:47 PDT 2015


Author: zturner
Date: Wed Aug 26 14:44:45 2015
New Revision: 246062

URL: http://llvm.org/viewvc/llvm-project?rev=246062&view=rev
Log:
On Windows, use 'del' instead of 'rm' to delete the test executable.

This is a nasty hack to work around the issue described in
https://llvm.org/pr24589

Modified:
    lldb/trunk/test/make/Makefile.rules

Modified: lldb/trunk/test/make/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/make/Makefile.rules?rev=246062&r1=246061&r2=246062&view=diff
==============================================================================
--- lldb/trunk/test/make/Makefile.rules (original)
+++ lldb/trunk/test/make/Makefile.rules Wed Aug 26 14:44:45 2015
@@ -533,7 +533,7 @@ endif
 dsym:	$(DSYM)
 all:	$(EXE) $(DSYM)
 clean::
-	$(RM) "$(EXE)" $(OBJECTS) $(PREREQS) $(PREREQS:.d=.d.tmp) $(ARCHIVE_NAME) $(ARCHIVE_OBJECTS)
+	$(RM) $(OBJECTS) $(PREREQS) $(PREREQS:.d=.d.tmp) $(ARCHIVE_NAME) $(ARCHIVE_OBJECTS)
 ifneq "$(DYLIB_NAME)" ""
 	$(RM) -r $(DYLIB_FILENAME).dSYM
 	$(RM) $(DYLIB_OBJECTS) $(DYLIB_PREREQS) $(DYLIB_PREREQS:.d=.d.tmp) $(DYLIB_FILENAME) $(DYLIB_FILENAME).debug
@@ -542,10 +542,14 @@ ifneq "$(DSYM)" ""
 	$(RM) -r "$(DSYM)"
 endif
 ifeq "$(OS)" "Windows_NT"
+# http://llvm.org/pr24589
+	IF EXIST "$(EXE)" del "$(EXE)"
 	$(RM) $(wildcard *.manifest *.pdb *.ilk)
-  ifneq "$(DYLIB_NAME)" ""
+ifneq "$(DYLIB_NAME)" ""
 	$(RM) $(DYLIB_NAME).lib $(DYLIB_NAME).exp
-  endif
+endif
+else
+	$(RM) "$(EXE)"
 endif
 
 #----------------------------------------------------------------------




More information about the lldb-commits mailing list