kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

fake.rb: rubyarchhdrdir for rubyspec

Browse source 
* 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.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49758 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-02-25 17:19:57 +00:00
parent 41b2f1ada4
commit 25f99aef58
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
common.mk
View file

@ -597,8 +597,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

2
template/fake.rb.in
View file

@ -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(" ")

2
tool/fake.rb
View file

@ -20,8 +20,10 @@ 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")
config["rubyarchhdrdir"] = File.join(builddir, config["EXTOUT"], "include", config["arch"])
mkconfig["libdir"] = config["libdir"] = mkconfig["topdir"]
trace_var(:$ruby, posthook)
end