kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

mkmf.rb: use TARGET_SO

Browse source 
* lib/mkmf.rb (create_makefile): use TARGET_SO consistently.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55949 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-08-17 07:20:23 +00:00
parent 6256559887
commit 39e3db3510
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/mkmf.rb
View file

@ -2305,14 +2305,14 @@ TIMESTAMP_DIR = #{$extout ? '$(extout)/.timestamp' : '.'}
n = ($extout ? '$(RUBYARCHDIR)/' : '') + '$(TARGET)' n = ($extout ? '$(RUBYARCHDIR)/' : '') + '$(TARGET)'
mfile.print " mfile.print "
TARGET_SO = #{($extout ? '$(RUBYARCHDIR)/' : '')}$(DLLIB) TARGET_SO = #{($extout ? '$(RUBYARCHDIR)/' : '')}$(DLLIB)
CLEANLIBS = #{n}.#{CONFIG['DLEXT']} #{config_string('cleanlibs') {|t| t.gsub(/\$\*/) {n}}} CLEANLIBS = $(TARGET_SO) #{config_string('cleanlibs') {|t| t.gsub(/\$\*/) {n}}}
CLEANOBJS = *.#{$OBJEXT} #{config_string('cleanobjs') {|t| t.gsub(/\$\*/, "$(TARGET)#{deffile ? '-$(arch)': ''}")} if target} *.bak CLEANOBJS = *.#{$OBJEXT} #{config_string('cleanobjs') {|t| t.gsub(/\$\*/, "$(TARGET)#{deffile ? '-$(arch)': ''}")} if target} *.bak
all: #{$extout ? "install" : target ? "$(DLLIB)" : "Makefile"} all: #{$extout ? "install" : target ? "$(DLLIB)" : "Makefile"}
static: #{$extmk && !$static ? "all" : "$(STATIC_LIB)#{!$extmk ? " install-rb" : ""}"} static: #{$extmk && !$static ? "all" : "$(STATIC_LIB)#{!$extmk ? " install-rb" : ""}"}
.PHONY: all install static install-so install-rb .PHONY: all install static install-so install-rb
.PHONY: clean clean-so clean-static clean-rb .PHONY: clean clean-so clean-static clean-rb
" " #"
mfile.print CLEANINGS mfile.print CLEANINGS
fsep = config_string('BUILD_FILE_SEPARATOR') {|s| s unless s == "/"} fsep = config_string('BUILD_FILE_SEPARATOR') {|s| s unless s == "/"}
if fsep if fsep
@ -2334,7 +2334,7 @@ static: #{$extmk && !$static ? "all" : "$(STATIC_LIB)#{!$extmk ? " install-rb" :
mfile.print("install-so: ") mfile.print("install-so: ")
if target if target
f = "$(DLLIB)" f = "$(DLLIB)"
dest = "#{dir}/#{f}" dest = "$(TARGET_SO)"
stamp = timestamp_file(dir, target_prefix) stamp = timestamp_file(dir, target_prefix)
if $extout if $extout
mfile.puts dest mfile.puts dest
@ -2446,8 +2446,7 @@ site-install-rb: install-rb
end end
end end
mfile.print "$(RUBYARCHDIR)/" if $extout mfile.print "$(TARGET_SO): "
mfile.print "$(DLLIB): "
mfile.print "$(DEFFILE) " if makedef mfile.print "$(DEFFILE) " if makedef
mfile.print "$(OBJS) Makefile" mfile.print "$(OBJS) Makefile"
mfile.print " #{timestamp_file('$(RUBYARCHDIR)', target_prefix)}" if $extout mfile.print " #{timestamp_file('$(RUBYARCHDIR)', target_prefix)}" if $extout