nobu	2015-12-05 17:48:28 +0900 (Sat, 05 Dec 2015)

  New Revision: 52898

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

  Log:
    Fix cross build
    
    * tool/fake.rb: Fix cross build when srcdir is an absolute path.
    * Makefile.in: PREP dependency is needed when cross build too, not
      "-r$(arch)-fake" to be  used before created.  [Fix GH-1125]

  Modified files:
    trunk/ChangeLog
    trunk/Makefile.in
    trunk/tool/fake.rb
    trunk/win32/Makefile.sub
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 52897)
+++ ChangeLog	(revision 52898)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sat Dec  5 17:48:25 2015  Lars Kanis  <lars@g...>
+
+	* tool/fake.rb: Fix cross build when srcdir is an absolute path.
+
+	* Makefile.in: PREP dependency is needed when cross build too, not
+	  "-r$(arch)-fake" to be  used before created.  [Fix GH-1125]
+
 Sat Dec  5 17:26:24 2015  Nobuyoshi Nakada  <nobu@r...>
 
 	* hash.c (env_str_new, env_path_str_new): make default string
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 52897)
+++ win32/Makefile.sub	(revision 52898)
@@ -1061,9 +1061,7 @@ clean-enc distclean-enc realclean-enc: https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L1061
 	@-$(MAKE) -f $(ENC_MK) $(MFLAGS) V=$(V) $(@:-enc=)
 !endif
 
-!if "$(CROSS_COMPILING)" == "no"
 $(RBCONFIG): $(PREP)
-!endif
 
 $(RCFILES): $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb
 		@$(MINIRUBY) $(srcdir)/win32/resource.rb \
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 52897)
+++ Makefile.in	(revision 52898)
@@ -258,7 +258,7 @@ ruby-runner.c: template/ruby-runner.c.in https://github.com/ruby/ruby/blob/trunk/Makefile.in#L258
 ruby-runner$(EXEEXT): ruby-runner.c
 	$(Q) $(PURIFY) $(CC) $(CFLAGS) $(CPPFLAGS) -DRUBY_INSTALL_NAME=$(RUBY_INSTALL_NAME) $(LDFLAGS) $(LIBS) $(OUTFLAG)$@ ruby-runner.c
 
-$(RBCONFIG): $($(CROSS_COMPILING:no=)PREP)
+$(RBCONFIG): $(PREP)
 
 rbconfig.rb: $(RBCONFIG)
 
Index: tool/fake.rb
===================================================================
--- tool/fake.rb	(revision 52897)
+++ tool/fake.rb	(revision 52898)
@@ -46,7 +46,8 @@ prehook = proc do |extmk| https://github.com/ruby/ruby/blob/trunk/tool/fake.rb#L46
   end
   join = proc {|*args| File.join(*args).sub!(/\A(?:\.\/)*/, '')}
   $topdir ||= builddir
-  $top_srcdir ||= join[$topdir, srcdir]
+  $top_srcdir ||= (File.identical?(top_srcdir, dir = join[$topdir, srcdir]) ?
+                     dir : top_srcdir)
   $extout = '$(topdir)/.ext'
   $extout_prefix = '$(extout)$(target_prefix)/'
   config = RbConfig::CONFIG

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