mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
[ruby/psych] Removed the related condition of --enable-bundled-libyaml
https://github.com/ruby/psych/commit/7c211a43c1
This commit is contained in:
parent
94d4bea7c9
commit
fc218e5977
1 changed files with 1 additions and 6 deletions
|
@ -15,13 +15,8 @@ unless yaml_source # default to pre-installed libyaml
|
|||
end
|
||||
end
|
||||
|
||||
if yaml_source == true
|
||||
# search the latest libyaml source under $srcdir
|
||||
yaml_source = Dir.glob("#{$srcdir}/yaml{,-*}/").max_by {|n| File.basename(n).scan(/\d+/).map(&:to_i)}
|
||||
elsif yaml_source
|
||||
yaml_source = yaml_source.gsub(/\$\((\w+)\)|\$\{(\w+)\}/) {ENV[$1||$2]}
|
||||
end
|
||||
if yaml_source
|
||||
yaml_source = yaml_source.gsub(/\$\((\w+)\)|\$\{(\w+)\}/) {ENV[$1||$2]}
|
||||
yaml_source = yaml_source.chomp("/")
|
||||
yaml_configure = "#{File.expand_path(yaml_source)}/configure"
|
||||
unless File.exist?(yaml_configure)
|
||||
|
|
Loading…
Reference in a new issue