[前][次][番号順一覧][スレッド一覧]

ruby-changes:43876

From: nobu <ko1@a...>
Date: Wed, 17 Aug 2016 16:20:29 +0900 (JST)
Subject: [ruby-changes:43876] nobu:r55949 (trunk): mkmf.rb: use TARGET_SO

nobu	2016-08-17 16:20:23 +0900 (Wed, 17 Aug 2016)

  New Revision: 55949

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=55949

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

  Modified files:
    trunk/lib/mkmf.rb
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 55948)
+++ lib/mkmf.rb	(revision 55949)
@@ -2305,14 +2305,14 @@ TIMESTAMP_DIR = #{$extout ? '$(extout)/. https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L2305
     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" : " https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L2334
     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 https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L2446
       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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]