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 /tool | |
| 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 'tool')
| -rw-r--r-- | tool/fake.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tool/fake.rb b/tool/fake.rb index 7d3a471402..f8c68173e6 100644 --- a/tool/fake.rb +++ b/tool/fake.rb @@ -20,9 +20,11 @@ prehook = proc do |extmk| mkconfig = RbConfig::MAKEFILE_CONFIG mkconfig["top_srcdir"] = $top_srcdir = top_srcdir mkconfig["rubyhdrdir"] = "$(top_srcdir)/include" + mkconfig["rubyarchhdrdir"] = "$(builddir)/$(EXTOUT)/include/$(arch)" mkconfig["builddir"] = config["builddir"] = builddir config["rubyhdrdir"] = File.join(mkconfig["top_srcdir"], "include") - mkconfig["libdir"] = config["libdir"] = mkconfig["topdir"] + config["rubyarchhdrdir"] = File.join(builddir, config["EXTOUT"], "include", config["arch"]) + mkconfig["libdirname"] = "builddir" trace_var(:$ruby, posthook) end untrace_var(:$extmk, prehook) |