diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-09-01 15:55:13 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-09-01 15:55:13 +0000 |
| commit | 10371d3d5f4f72f614dd2f8277f438486859bd56 (patch) | |
| tree | f5192495dc1236ff22aac3bb3e8749ac089fc0a8 /lib | |
| parent | cd2d61be00748ee28cd9c46d2336c0ae61495197 (diff) | |
| download | ruby-10371d3d5f4f72f614dd2f8277f438486859bd56.tar.gz | |
extmk.rb: fix conflict of timestamp files
* ext/extmk.rb (timestamp_file): move extmk.rb specific tricks
from lib/mkmf.rb. keep RUBYCOMMONDIR prefix not to conflict
with a timestamp file in the toplevel.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56057 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -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 8eb2b29ba5..53f9fd96fa 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -2025,9 +2025,9 @@ preload = #{defined?($preload) && $preload ? $preload.join(' ') : ''} pat[n] = $` if /\$\(target_prefix\)\z/ =~ d end name = name.gsub(/\$\((#{pat.keys.join("|")})\)/) {pat[$1]+target_prefix} - name.sub!(/\A\$\((?:extout|RUBYCOMMONDIR)\)\/*/, '') name.sub!(/(\$\((?:site)?arch\))\/*/, '') arch = $1 || '' + name.chomp!('/') name = name.gsub(/(\$[({]|[})])|(\/+)|[^-.\w]+/) {$1 ? "" : $2 ? ".-." : "_"} File.join("$(TIMESTAMP_DIR)", arch, "#{name.sub(/\A(?=.)/, '.')}.time") end |