Commit 5caeef10 authored by simonmar's avatar simonmar
Browse files

[project @ 2003-04-11 13:09:44 by simonmar]

Add -print to some $(FIND) commands, so as to be more compatible with
non-GNU finds.
parent 6157da7b
...@@ -304,7 +304,7 @@ SRC_HC_OPTS += -split-objs ...@@ -304,7 +304,7 @@ SRC_HC_OPTS += -split-objs
ifeq "$(ArSupportsInput)" "" ifeq "$(ArSupportsInput)" ""
define BUILD_LIB define BUILD_LIB
$(RM) $@ $@.tmp $(RM) $@ $@.tmp
(echo $(STUBOBJS) $(C_OBJS); $(FIND) $(patsubst %.$(way_)o,%_split,$(HS_OBJS)) -name '*.$(way_)o') | xargs $(AR) $@ (echo $(STUBOBJS) $(C_OBJS); $(FIND) $(patsubst %.$(way_)o,%_split,$(HS_OBJS)) -name '*.$(way_)o') -print | xargs $(AR) $@
$(RANLIB) $@ $(RANLIB) $@
endef endef
else else
...@@ -312,7 +312,7 @@ define BUILD_LIB ...@@ -312,7 +312,7 @@ define BUILD_LIB
$(RM) $@ $@.tmp $(RM) $@ $@.tmp
echo $(STUBOBJS) > $@.list echo $(STUBOBJS) > $@.list
echo $(C_OBJS) >> $@.list echo $(C_OBJS) >> $@.list
$(FIND) $(patsubst %.$(way_)o,%_split,$(HS_OBJS)) -name '*.$(way_)o' >> $@.list $(FIND) $(patsubst %.$(way_)o,%_split,$(HS_OBJS)) -name '*.$(way_)o' -print >> $@.list
$(AR) $(AR_OPTS) $@ $(ArSupportsInput) $@.list $(AR) $(AR_OPTS) $@ $(ArSupportsInput) $@.list
$(RM) $@.list $(RM) $@.list
$(RANLIB) $@ $(RANLIB) $@
...@@ -323,7 +323,7 @@ endif ...@@ -323,7 +323,7 @@ endif
HC_SPLIT_PRE = \ HC_SPLIT_PRE = \
$(RM) $@; if [ ! -d $(basename $@)_split ]; then mkdir $(basename $@)_split; else \ $(RM) $@; if [ ! -d $(basename $@)_split ]; then mkdir $(basename $@)_split; else \
$(FIND) $(basename $@)_split -name '*.$(way_)o' | xargs $(RM) __rm_food; fi $(FIND) $(basename $@)_split -name '*.$(way_)o' -print | xargs $(RM) __rm_food; fi
ifeq "$(GhcWithInterpreter)" "YES" ifeq "$(GhcWithInterpreter)" "YES"
HC_SPLIT_POST = (cd $(dir $@) && $(LD) -r $(LD_X) -o $(notdir $@) $(basename $(notdir $@))_split/*.$(way_)o) HC_SPLIT_POST = (cd $(dir $@) && $(LD) -r $(LD_X) -o $(notdir $@) $(basename $(notdir $@))_split/*.$(way_)o)
else else
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment