nobu	2015-02-26 02:19:57 +0900 (Thu, 26 Feb 2015)

  New Revision: 49758

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=49758

  Log:
    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.

  Modified files:
    trunk/common.mk
    trunk/template/fake.rb.in
    trunk/tool/fake.rb
Index: common.mk
===================================================================
--- common.mk	(revision 49757)
+++ common.mk	(revision 49758)
@@ -597,8 +597,8 @@ $(RBCONFIG): $(srcdir)/tool/mkconfig.rb https://github.com/ruby/ruby/blob/trunk/common.mk#L597
 
 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
Index: tool/fake.rb
===================================================================
--- tool/fake.rb	(revision 49757)
+++ tool/fake.rb	(revision 49758)
@@ -20,8 +20,10 @@ prehook = proc do |extmk| https://github.com/ruby/ruby/blob/trunk/tool/fake.rb#L20
     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
Index: template/fake.rb.in
===================================================================
--- template/fake.rb.in	(revision 49757)
+++ template/fake.rb.in	(revision 49758)
@@ -1,5 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/template/fake.rb.in#L1
 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 https://github.com/ruby/ruby/blob/trunk/template/fake.rb.in#L27
 $:.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(" ")

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/