From: simonmar Date: Mon, 30 Sep 2002 10:32:41 +0000 (+0000) Subject: [project @ 2002-09-30 10:32:41 by simonmar] X-Git-Tag: Approx_11550_changesets_converted~1607 X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=be1e55ec3bb9bc97720ab1627fcb52e0e6de655f [project @ 2002-09-30 10:32:41 by simonmar] Don't bother with the $@.tmp hack in the rule for building libraries, .DELETE_ON_ERROR (in suffix.mk) should do the job for us. --- diff --git a/mk/target.mk b/mk/target.mk index 3a54c97..baaaeb3 100644 --- a/mk/target.mk +++ b/mk/target.mk @@ -302,9 +302,8 @@ SRC_HC_OPTS += -split-objs ifeq "$(ArSupportsInput)" "" define BUILD_LIB $(RM) $@ $@.tmp -(echo $(STUBOBJS) $(EXTRA_OBJS); $(FIND) $(patsubst %.$(way_)o,%_split,$(HS_OBJS)) -name '*.$(way_)o') | xargs ar q $@.tmp -$(RANLIB) $@.tmp -$(MV) $@.tmp $@ +(echo $(STUBOBJS) $(EXTRA_OBJS); $(FIND) $(patsubst %.$(way_)o,%_split,$(HS_OBJS)) -name '*.$(way_)o') | xargs ar q $@ +$(RANLIB) $@ endef else define BUILD_LIB @@ -312,10 +311,9 @@ $(RM) $@ $@.tmp echo $(STUBOBJS) > $@.list echo $(EXTRA_OBJS) >> $@.list $(FIND) $(patsubst %.$(way_)o,%_split,$(HS_OBJS)) -name '*.$(way_)o' >> $@.list -$(AR) $(AR_OPTS) $@.tmp $(ArSupportsInput) $@.list +$(AR) $(AR_OPTS) $@ $(ArSupportsInput) $@.list $(RM) $@.list -$(RANLIB) $@.tmp -$(MV) $@.tmp $@ +$(RANLIB) $@ endef endif