From ab4dba0da6730950c23a357e14419b2028cb4d72 Mon Sep 17 00:00:00 2001 From: nagachika Date: Sun, 10 Mar 2013 15:54:58 +0000 Subject: merge revision(s) 39489,39490: [Backport #7950] * enc/depend (ARFLAGS): VisualC++ linker does not allow spaces between output option and the output file name. [Bug #7950] * enc/depend (RANLIB): set default command to do nothing, or make the entire line a label on Windows. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39704 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- enc/Makefile.in | 1 + enc/depend | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'enc') diff --git a/enc/Makefile.in b/enc/Makefile.in index 2c15e904dc..a64785d1c5 100644 --- a/enc/Makefile.in +++ b/enc/Makefile.in @@ -35,6 +35,7 @@ LIBRUBYARG_STATIC = $(LIBRUBYARG_SHARED) empty = AR = @AR@ CC = @CC@ +ARFLAGS = @ARFLAGS@$(empty) RANLIB = @RANLIB@ OUTFLAG = @OUTFLAG@$(empty) COUTFLAG = @COUTFLAG@$(empty) diff --git a/enc/depend b/enc/depend index c437da70a2..014fc4f584 100644 --- a/enc/depend +++ b/enc/depend @@ -10,6 +10,8 @@ % rule_subst = CONFIG["RULE_SUBST"] || "%s" % transvpath = rule_subst.dup.sub!(/\{[^{}]+\}/, '$(TRANSVPATH)/') || "enc/trans/%s" % transvpath_prefix = (rule_subst.dup.sub!(/\{[^{}]+\}/, '{$(TRANSVPATH)}') || "%s") % "" +% CONFIG['ARFLAGS'] = 'rcu ' if (CONFIG['ARFLAGS'] || "").empty? +% CONFIG['RANLIB'] = ':' if (CONFIG['RANLIB'] || "").empty? % if File::ALT_SEPARATOR % pathrep = proc {|path| path.gsub('/', File::ALT_SEPARATOR).gsub(/\$\(([@ $@ $(ENCOBJS) + $(Q) $(AR) $(ARFLAGS)$@ $(ENCOBJS) @-$(RANLIB) $@ 2> /dev/null || true $(LIBTRANS): $(TRANSOBJS) @$(RM) $@ $(ECHO) linking statically-linked transcoder library $@ - $(Q) $(AR) <%=CONFIG['ARFLAGS'] || 'rcu' %> $@ $(TRANSOBJS) + $(Q) $(AR) $(ARFLAGS)$@ $(TRANSOBJS) @-$(RANLIB) $@ 2> /dev/null || true srcs: $(TRANSCSRCS) -- cgit v1.2.3