diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-08-31 11:20:45 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-08-31 11:20:45 +0000 |
commit | 99e3bbe1dfd8928664c393eefd9a012a38e78e7b (patch) | |
tree | 736e26b2c7924b0f50e7cc254051f2d79bac38b8 | |
parent | 6d1fc18348ad6577bc3ea67aa64bee9bd581abf6 (diff) | |
download | ruby-99e3bbe1dfd8928664c393eefd9a012a38e78e7b.tar.gz |
mkmf.rb: fix up r56047
* lib/mkmf.rb (create_makefile): TARGET_SO_DIR should not be the
root directory when sodir is empty.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56049 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | lib/mkmf.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index b16600de6a..ea5492e0ed 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -2308,7 +2308,7 @@ TIMESTAMP_DIR = #{$extout ? '$(extout)/.timestamp' : '.'} '$(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 |