mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
Use $ignore_error defined in mkmf.rb
This commit is contained in:
parent
3a95834739
commit
1ac228378c
2 changed files with 10 additions and 10 deletions
18
enc/depend
18
enc/depend
|
@ -18,6 +18,7 @@
|
||||||
% else
|
% else
|
||||||
% pathrep = proc {|path| path}
|
% pathrep = proc {|path| path}
|
||||||
% end
|
% end
|
||||||
|
% ignore_error = $ignore_error
|
||||||
|
|
||||||
VPATH = <%=%w[$(arch_hdrdir)/ruby $(hdrdir)/ruby $(srcdir) $(encsrcdir)].join(CONFIG["PATH_SEPARATOR"])%>
|
VPATH = <%=%w[$(arch_hdrdir)/ruby $(hdrdir)/ruby $(srcdir) $(encsrcdir)].join(CONFIG["PATH_SEPARATOR"])%>
|
||||||
LIBPATH = <%=libpathflag($DEFLIBPATH)%>
|
LIBPATH = <%=libpathflag($DEFLIBPATH)%>
|
||||||
|
@ -73,12 +74,12 @@ $(LIBENC): $(ENCOBJS)
|
||||||
@$(RM) $@
|
@$(RM) $@
|
||||||
$(ECHO) linking statically-linked encoding library $@
|
$(ECHO) linking statically-linked encoding library $@
|
||||||
$(Q) $(AR) $(ARFLAGS)$@ $(ENCOBJS)
|
$(Q) $(AR) $(ARFLAGS)$@ $(ENCOBJS)
|
||||||
@-$(RANLIB) $@ 2> /dev/null || true
|
@-$(RANLIB) $@<%=ignore_error%>
|
||||||
$(LIBTRANS): $(TRANSOBJS)
|
$(LIBTRANS): $(TRANSOBJS)
|
||||||
@$(RM) $@
|
@$(RM) $@
|
||||||
$(ECHO) linking statically-linked transcoder library $@
|
$(ECHO) linking statically-linked transcoder library $@
|
||||||
$(Q) $(AR) $(ARFLAGS)$@ $(TRANSOBJS)
|
$(Q) $(AR) $(ARFLAGS)$@ $(TRANSOBJS)
|
||||||
@-$(RANLIB) $@ 2> /dev/null || true
|
@-$(RANLIB) $@<%=ignore_error%>
|
||||||
|
|
||||||
enc trans $(ENCSOS) $(TRANSSOS): config.status
|
enc trans $(ENCSOS) $(TRANSSOS): config.status
|
||||||
|
|
||||||
|
@ -156,24 +157,23 @@ clean:
|
||||||
% %w[$(ENCSOS) $(LIBENC) $(ENCOBJS) $(ENCCLEANOBJS) $(ENCCLEANLIBS) $(TRANSSOS) $(LIBTRANS) $(TRANSOBJS) $(TRANSCLEANOBJS) $(TRANSCLEANLIBS) $(ENC_TRANS_D) $(ENC_TRANS_SO_D)].each do |clean|
|
% %w[$(ENCSOS) $(LIBENC) $(ENCOBJS) $(ENCCLEANOBJS) $(ENCCLEANLIBS) $(TRANSSOS) $(LIBTRANS) $(TRANSOBJS) $(TRANSCLEANOBJS) $(TRANSCLEANLIBS) $(ENC_TRANS_D) $(ENC_TRANS_SO_D)].each do |clean|
|
||||||
$(Q)$(RM) <%=pathrep[clean]%>
|
$(Q)$(RM) <%=pathrep[clean]%>
|
||||||
% end
|
% end
|
||||||
% @ignore_error = $nmake ? '' : ' 2> /dev/null || true'
|
|
||||||
% unless inplace
|
% unless inplace
|
||||||
$(Q)$(RM) enc/unicode/*/casefold.h enc/unicode/*/name2ctype.h
|
$(Q)$(RM) enc/unicode/*/casefold.h enc/unicode/*/name2ctype.h
|
||||||
$(Q)$(RM) enc/jis/props.h
|
$(Q)$(RM) enc/jis/props.h
|
||||||
-$(Q)$(RMDIR) enc/unicode<%=@ignore_error%>
|
-$(Q)$(RMDIR) enc/unicode<%=ignore_error%>
|
||||||
% end
|
% end
|
||||||
% workdirs.reverse_each do|d|
|
% workdirs.reverse_each do|d|
|
||||||
-$(Q)$(RMDIR) <%=pathrep[d]%><%=@ignore_error%>
|
-$(Q)$(RMDIR) <%=pathrep[d]%><%=ignore_error%>
|
||||||
% end
|
% end
|
||||||
|
|
||||||
clean-srcs:
|
clean-srcs:
|
||||||
$(Q)$(RM) <%=pathrep['$(TRANSCSRCS)']%>
|
$(Q)$(RM) <%=pathrep['$(TRANSCSRCS)']%>
|
||||||
-$(Q)$(RMDIR) <%=pathrep['enc/trans']%><%=@ignore_error%>
|
-$(Q)$(RMDIR) <%=pathrep['enc/trans']%><%=ignore_error%>
|
||||||
$(Q)$(RM) enc/unicode/*/casefold.h enc/unicode/*/name2ctype.h
|
$(Q)$(RM) enc/unicode/*/casefold.h enc/unicode/*/name2ctype.h
|
||||||
$(Q)$(RM) enc/jis/props.h
|
$(Q)$(RM) enc/jis/props.h
|
||||||
-$(Q)$(RMDIR) <%=pathrep['enc/unicode']%><%=@ignore_error%>
|
-$(Q)$(RMDIR) <%=pathrep['enc/unicode']%><%=ignore_error%>
|
||||||
-$(Q)$(RMDIR) <%=pathrep['enc/props']%><%=@ignore_error%>
|
-$(Q)$(RMDIR) <%=pathrep['enc/props']%><%=ignore_error%>
|
||||||
-$(Q)$(RMDIR) <%=pathrep['enc']%><%=@ignore_error%>
|
-$(Q)$(RMDIR) <%=pathrep['enc']%><%=ignore_error%>
|
||||||
|
|
||||||
<%# vim: set ft=eruby noexpandtab ts=8 sw=2 : -%>
|
<%# vim: set ft=eruby noexpandtab ts=8 sw=2 : -%>
|
||||||
|
|
||||||
|
|
|
@ -2497,7 +2497,7 @@ site-install-rb: install-rb
|
||||||
mfile.print "$(ECHO) linking static-library $(@#{rsep})\n\t$(Q) "
|
mfile.print "$(ECHO) linking static-library $(@#{rsep})\n\t$(Q) "
|
||||||
mfile.print "$(AR) #{config_string('ARFLAGS') || 'cru '}$@ $(OBJS)"
|
mfile.print "$(AR) #{config_string('ARFLAGS') || 'cru '}$@ $(OBJS)"
|
||||||
config_string('RANLIB') do |ranlib|
|
config_string('RANLIB') do |ranlib|
|
||||||
mfile.print "\n\t-$(Q)#{ranlib} $(@) 2> /dev/null || true"
|
mfile.print "\n\t-$(Q)#{ranlib} $(@)#{$ignore_error}"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
mfile.print "\n\n"
|
mfile.print "\n\n"
|
||||||
|
|
Loading…
Add table
Reference in a new issue