nobu	2016-02-29 16:31:56 +0900 (Mon, 29 Feb 2016)

  New Revision: 53969

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

  Log:
    mkconfig.rb: cross_compiling option
    
    * common.mk, tool/mkconfig.rb: set cross_compiling option from
      Makefile, but not from rbconfig.rb, which is just going to be
      created by this command.

  Modified files:
    trunk/ChangeLog
    trunk/common.mk
    trunk/tool/mkconfig.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 53968)
+++ ChangeLog	(revision 53969)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Mon Feb 29 16:31:01 2016  Nobuyoshi Nakada  <nobu@r...>
+
+	* common.mk, tool/mkconfig.rb: set cross_compiling option from
+	  Makefile, but not from rbconfig.rb, which is just going to be
+	  created by this command.
+
 Sun Feb 28 23:13:49 2016  C.J. Collier  <cjcollier@l...>
 
 	* configure.in: Add summary to end of configure output.
Index: common.mk
===================================================================
--- common.mk	(revision 53968)
+++ common.mk	(revision 53969)
@@ -625,6 +625,7 @@ extconf: $(PREP) https://github.com/ruby/ruby/blob/trunk/common.mk#L625
 
 $(RBCONFIG): $(srcdir)/tool/mkconfig.rb config.status $(srcdir)/version.h
 	$(Q)$(BOOTSTRAPRUBY) $(srcdir)/tool/mkconfig.rb -timestamp=$@ \
+		-cross_compiling=$(CROSS_COMPILING) \
 		-arch=$(arch) -version=$(RUBY_PROGRAM_VERSION) \
 		-install_name=$(RUBY_INSTALL_NAME) \
 		-so_name=$(RUBY_SO_NAME) rbconfig.rb
Index: tool/mkconfig.rb
===================================================================
--- tool/mkconfig.rb	(revision 53968)
+++ tool/mkconfig.rb	(revision 53969)
@@ -8,11 +8,12 @@ https://github.com/ruby/ruby/blob/trunk/tool/mkconfig.rb#L8
 # avoid warnings with -d.
 $install_name ||= nil
 $so_name ||= nil
+$cross_compiling ||= nil
 arch = $arch or raise "missing -arch"
 version = $version or raise "missing -version"
 
 srcdir = File.expand_path('../..', __FILE__)
-$:.replace [srcdir+"/lib"] unless defined?(CROSS_COMPILING)
+$:.replace [srcdir+"/lib"] unless $cross_compiling == "yes"
 $:.unshift(".")
 
 require "fileutils"

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