diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-12-05 08:48:28 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-12-05 08:48:28 +0000 |
commit | 10a0555a7ab12567ad94732b2baf5f7e3e7e8b1c (patch) | |
tree | c40866c27a4c4d7de39ef55dc9a9bf5429a83b13 /tool | |
parent | fcc896e28fb312d5dc14a1ef04902e60383800d6 (diff) | |
download | ruby-10a0555a7ab12567ad94732b2baf5f7e3e7e8b1c.tar.gz |
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')
-rw-r--r-- | tool/fake.rb | 3 |
1 files changed, 2 insertions, 1 deletions
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 |