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

ruby-changes:43976

From: nobu <ko1@a...>
Date: Wed, 31 Aug 2016 20:20:50 +0900 (JST)
Subject: [ruby-changes:43976] nobu:r56049 (trunk): mkmf.rb: fix up r56047

nobu	2016-08-31 20:20:45 +0900 (Wed, 31 Aug 2016)

  New Revision: 56049

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

  Log:
    mkmf.rb: fix up r56047
    
    * lib/mkmf.rb (create_makefile): TARGET_SO_DIR should not be the
      root directory when sodir is empty.

  Modified files:
    trunk/lib/mkmf.rb
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 56048)
+++ lib/mkmf.rb	(revision 56049)
@@ -2308,7 +2308,7 @@ TIMESTAMP_DIR = #{$extout ? '$(extout)/. https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L2308
             '$(RUBYARCHDIR)'
     n = '$(TARGET_SO_DIR)$(TARGET)'
     mfile.print "
-TARGET_SO_DIR =#{(sodir ? " #{sodir}/" : '')}
+TARGET_SO_DIR =#{(sodir && !sodir.empty? ? " #{sodir}/" : '')}
 TARGET_SO     = $(TARGET_SO_DIR)$(DLLIB)
 CLEANLIBS     = $(TARGET_SO) #{config_string('cleanlibs') {|t| t.gsub(/\$\*/) {n}}}
 CLEANOBJS     = *.#{$OBJEXT} #{config_string('cleanobjs') {|t| t.gsub(/\$\*/, "$(TARGET)#{deffile ? '-$(arch)': ''}")} if target} *.bak

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

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