From 10a0555a7ab12567ad94732b2baf5f7e3e7e8b1c Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 5 Dec 2015 08:48:28 +0000
Subject: 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]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52898 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 tool/fake.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tool')

diff --git a/tool/fake.rb b/tool/fake.rb
index 9fe95a5bd6..353a7b7035 100644
--- a/tool/fake.rb
+++ b/tool/fake.rb
@@ -46,7 +46,8 @@ prehook = proc do |extmk|
   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
-- 
cgit v1.2.3