mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
Make the timestamp path correspond to the bundled target path
So different timestamps for different paths will be used. Extentions paths in bundled gems contain `ruby_version`, which includes the ABI version, and the same timestamp file for different paths resulted in build failures when it changed.
This commit is contained in:
parent
3af373285b
commit
711b2ed5fe
1 changed files with 7 additions and 2 deletions
|
@ -536,9 +536,14 @@ extend Module.new {
|
|||
|
||||
def timestamp_file(name, target_prefix = nil)
|
||||
if @gemname and name == '$(TARGET_SO_DIR)'
|
||||
name = "$(arch)/gems/#{@gemname}#{target_prefix}"
|
||||
gem = true
|
||||
name = "$(gem_platform)/$(ruby_version)/gems/#{@gemname}#{target_prefix}"
|
||||
end
|
||||
super.sub(%r[/\.extout\.(?:-\.)?], '/.')
|
||||
path = super.sub(%r[/\.extout\.(?:-\.)?], '/.')
|
||||
if gem
|
||||
nil while path.sub!(%r[/\.(gem_platform|ruby_version)\.-(?=\.)], '/$(\1)/')
|
||||
end
|
||||
path
|
||||
end
|
||||
|
||||
def configuration(srcdir)
|
||||
|
|
Loading…
Reference in a new issue