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 /common.mk | |
| 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 'common.mk')
| -rw-r--r-- | common.mk | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -584,8 +584,8 @@ $(RBCONFIG): $(srcdir)/tool/mkconfig.rb config.status $(srcdir)/version.h $(PREP test-rubyspec-precheck: -test-rubyspec: test-rubyspec-precheck - $(RUNRUBY) $(srcdir)/spec/mspec/bin/mspec run -B $(srcdir)/spec/default.mspec $(MSPECOPT) +test-rubyspec: test-rubyspec-precheck $(arch)-fake.rb + $(RUNRUBY) -r./$(arch)-fake $(srcdir)/spec/mspec/bin/mspec run -B $(srcdir)/spec/default.mspec $(MSPECOPT) RUNNABLE = $(LIBRUBY_RELATIVE:no=un)-runnable runnable: $(RUNNABLE) prog $(srcdir)/tool/mkrunnable.rb PHONY |