summaryrefslogtreecommitdiff
path: root/template
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-07-29 02:06:38 (GMT)
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-07-29 02:06:38 (GMT)
commit53e301a2d804919341b7012d58686edab5386116 (patch)
tree521812287802bc04a38f1cd16d73f028e0840b12 /template
parentc02ffd9a8ff79324ae178adf41f5d18f3b4ca634 (diff)
common.mk: fix conflict of version.i
* common.mk ($(arch)-fake.rb): read from STDIN instead of creating version.i, to get rid of conflict with tool/update-deps. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51419 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'template')
-rw-r--r--template/fake.rb.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/template/fake.rb.in b/template/fake.rb.in
index fa7f1f7..f2cc7c6 100644
--- a/template/fake.rb.in
+++ b/template/fake.rb.in
@@ -5,8 +5,8 @@ while /\A(\w+)=(.*)/ =~ ARGV[0]
arg[$1].tr!(File::ALT_SEPARATOR, File::SEPARATOR) if File::ALT_SEPARATOR
ARGV.shift
end
-if arg['i']
- src = File.read(arg['i'])
+if inc = arg['i']
+ src = inc == '-' ? STDIN.read : File.read(inc)
arg['versions'] = version = {}
File.read(File.join(arg['srcdir'], 'version.c')).
scan(/rb_define_global_const\("(RUBY_\w+)",[^;]*?\bMK(?:INT|STR)\(([^()]*)\)/m) do |n, v|