diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-08-17 07:20:23 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-08-17 07:20:23 +0000 |
| commit | acc7c14f619bca98af36d337fb0567644d724526 (patch) | |
| tree | 5abf0ef9b8be34393c3adebd37183a7522f0df4d /lib | |
| parent | 678d57672fa25a4516d147cc736f6a3052b9354d (diff) | |
| download | ruby-acc7c14f619bca98af36d337fb0567644d724526.tar.gz | |
mkmf.rb: use TARGET_SO
* 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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mkmf.rb | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index d00ebd669a..db461ad07d 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -2305,14 +2305,14 @@ TIMESTAMP_DIR = #{$extout ? '$(extout)/.timestamp' : '.'} n = ($extout ? '$(RUBYARCHDIR)/' : '') + '$(TARGET)' mfile.print " 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 all: #{$extout ? "install" : target ? "$(DLLIB)" : "Makefile"} static: #{$extmk && !$static ? "all" : "$(STATIC_LIB)#{!$extmk ? " install-rb" : ""}"} .PHONY: all install static install-so install-rb .PHONY: clean clean-so clean-static clean-rb -" +" #" mfile.print CLEANINGS fsep = config_string('BUILD_FILE_SEPARATOR') {|s| s unless s == "/"} if fsep @@ -2334,7 +2334,7 @@ static: #{$extmk && !$static ? "all" : "$(STATIC_LIB)#{!$extmk ? " install-rb" : mfile.print("install-so: ") if target f = "$(DLLIB)" - dest = "#{dir}/#{f}" + dest = "$(TARGET_SO)" stamp = timestamp_file(dir, target_prefix) if $extout mfile.puts dest @@ -2446,8 +2446,7 @@ site-install-rb: install-rb end end - mfile.print "$(RUBYARCHDIR)/" if $extout - mfile.print "$(DLLIB): " + mfile.print "$(TARGET_SO): " mfile.print "$(DEFFILE) " if makedef mfile.print "$(OBJS) Makefile" mfile.print " #{timestamp_file('$(RUBYARCHDIR)', target_prefix)}" if $extout |