diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-07-11 15:17:58 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-07-11 15:17:58 +0000 |
| commit | f54265a8eb872dbccb6e071aa62c840adf39e0a2 (patch) | |
| tree | f189f70db6c8eb7501b5c68f6b343d76b1b81243 /template | |
| parent | 3d36516d3a4f01912cd9c018aabf82d0aeb5a7c0 (diff) | |
merge revision(s) 49758,50356,50359: [Backport #12563]
fake.rb: rubyarchhdrdir for rubyspec
* common.mk (test-rubyspec): use fake script to set header
directories.
* template/fake.rb.in (RUBYOPT): set -r option to propagate to
forked processes.
* tool/fake.rb (prehook): set rubyarchhdrdir too.
* too/fake.rb: don't fake libdir. use libdirname instead.
* tool/fake.rb: don't fake libdir. use libdirname instead.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@55637 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'template')
| -rw-r--r-- | template/fake.rb.in | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/template/fake.rb.in b/template/fake.rb.in index 6f5de5092f..8e461c57a4 100644 --- a/template/fake.rb.in +++ b/template/fake.rb.in @@ -1,5 +1,6 @@ baseruby="@BASERUBY@" ruby="${RUBY-$baseruby}" +baseruby= "eval" "{" \ "`expr \"$ruby\" : echo > /dev/null || echo exec`" \ "$ruby" '-r"`expr \"$0\" : / > /dev/null || pwd`/${0#/}" "$@";' \ @@ -26,3 +27,4 @@ end $:.unshift(File.expand_path(builddir)) fake = File.join(top_srcdir, "tool/fake.rb") eval(File.read(fake), nil, fake) +ENV["RUBYOPT"] = ["-r#{__FILE__}", ENV["RUBYOPT"]].compact.join(" ") |