Skip to content

Commit e961f53

Browse files
committed
More conservative rule for clean.
1 parent 81f3b33 commit e961f53

File tree

1 file changed

+29
-9
lines changed

1 file changed

+29
-9
lines changed

Makefile.in

Lines changed: 29 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -601,6 +601,15 @@ test/compile-fail/%.stage0.out.tmp: test/compile-fail/%.rs $(SREQ0)
601601
$(Q)grep --text --quiet \
602602
"$$(grep error-pattern $< | cut -d : -f 2- | tr -d '\n\r')" $@
603603

604+
######################################################################
605+
# Distribution
606+
######################################################################
607+
608+
PKG_NAME := rust
609+
PKG_VER = $(shell date +"%Y-%m-%d")-snap
610+
PKG_DIR = $(PKG_NAME)-$(PKG_VER)
611+
PKG_TAR = $(PKG_DIR).tar.gz
612+
604613

605614
######################################################################
606615
# Cleanup
@@ -610,12 +619,23 @@ test/compile-fail/%.stage0.out.tmp: test/compile-fail/%.rs $(SREQ0)
610619

611620
clean:
612621
@$(call E, cleaning)
613-
$(Q)rm -f $(foreach ext, cmx cmi cmo cma bc o a d $(X) \
614-
h cpp ml s \
615-
out bc dSYM \
616-
, \
617-
$(wildcard *.$(ext) \
618-
*/*.$(ext) \
619-
*/*/*.$(ext) \
620-
*/*/*/*.$(ext) \
621-
))
622+
$(Q)rm -f $(RUNTIME_OBJS)
623+
$(Q)rm -f $(LLVMEXT_OBJS)
624+
$(Q)rm -f $(BOOT_CMOS) $(BOOT_CMIS) $(BOOT_CMXS) $(BOOT_OBJS)
625+
$(Q)rm -f $(ML_DEPFILES) $(C_DEPFILES) $(CRATE_DEPFILES)
626+
$(Q)rm -f $(ML_DEPFILES:%.d=%.d.tmp)
627+
$(Q)rm -f $(C_DEPFILES:%.d=%.d.tmp)
628+
$(Q)rm -f $(CRATE_DEPFILES:%.d=%.d.tmp)
629+
$(Q)rm -f $(GENERATED)
630+
$(Q)rm -f boot/rustboot$(X) boot/$(CFG_STDLIB)
631+
$(Q)rm -f stage0/rustc$(X) stage0/$(CFG_STDLIB) stage0/glue*
632+
$(Q)rm -f stage1/rustc$(X) stage1/$(CFG_STDLIB) stage1/glue*
633+
$(Q)rm -f stage2/rustc$(X) stage2/$(CFG_STDLIB) stage2/glue*
634+
$(Q)rm -f llvmext/$(CFG_LLVMEXT) rt/$(CFG_RUNTIME)
635+
$(Q)rm -Rf $(PKG_NAME)-*.tar.gz dist
636+
$(Q)rm -f $(foreach ext,cmx cmi cmo cma bc o a d exe,\
637+
$(wildcard boot/*/*.$(ext) boot/*/*/*.$(ext)))
638+
$(Q)rm -Rf $(foreach ext,out out.tmp \
639+
boot$(X) stage0$(X) stage1$(X) stage2$(X) \
640+
bc o s exe dSYM, \
641+
$(wildcard test/*/*.$(ext)))

0 commit comments

Comments
 (0)