diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-25 06:47:23 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-25 06:47:23 +0000 |
| commit | 72aee03262254a78736de4dba6adba2ff25efd8c (patch) | |
| tree | cf4626e0e5c754809dafb62427979842fba1dfe2 /enc | |
| parent | 593ffbcf717bde5aa9b695aeb7808ddd74bb4ccf (diff) | |
depend: fix for static library on mswin
* 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/trunk@39489 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'enc')
| -rw-r--r-- | enc/Makefile.in | 1 | ||||
| -rw-r--r-- | enc/depend | 6 |
2 files changed, 5 insertions, 2 deletions
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..a059196f1c 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(/\$\(([@<?*]\w?|\w+)\)/, "$(\\1:/=\\#{File::ALT_SEPARATOR})")} % else @@ -63,12 +65,12 @@ libtrans: $(LIBTRANS) $(LIBENC): $(ENCOBJS) @$(RM) $@ $(ECHO) linking statically-linked encoding library $@ - $(Q) $(AR) <%=CONFIG['ARFLAGS'] || 'rcu' %> $@ $(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) |