summaryrefslogtreecommitdiff
path: root/tool/fake.rb
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-12-05 08:48:28 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-12-05 08:48:28 +0000
commitbf52a8b6c44a32a1e251ddc1dbb6904f4f6c6f87 (patch)
treec40866c27a4c4d7de39ef55dc9a9bf5429a83b13 /tool/fake.rb
parent80bedec6c25c82f2b37ecab5bab84576df52559c (diff)
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
Diffstat (limited to 'tool/fake.rb')
-rw-r--r--tool/fake.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/tool/fake.rb b/tool/fake.rb
index 9fe95a5..353a7b7 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