mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
[ruby/psych] Abandon when libyaml is not found
https://github.com/ruby/psych/commit/0b89eda398
This commit is contained in:
parent
0360fca4ad
commit
ed01bacf27
1 changed files with 5 additions and 8 deletions
|
@ -7,14 +7,6 @@ if $mswin or $mingw or $cygwin
|
|||
end
|
||||
|
||||
yaml_source = with_config("libyaml-source-dir")
|
||||
unless yaml_source # default to pre-installed libyaml
|
||||
pkg_config('yaml-0.1')
|
||||
dir_config('libyaml')
|
||||
unless find_header('yaml.h') && find_library('yaml', 'yaml_get_version')
|
||||
yaml_source = true # fallback to the bundled source if exists
|
||||
end
|
||||
end
|
||||
|
||||
if yaml_source
|
||||
yaml_source = yaml_source.gsub(/\$\((\w+)\)|\$\{(\w+)\}/) {ENV[$1||$2]}
|
||||
yaml_source = yaml_source.chomp("/")
|
||||
|
@ -44,6 +36,11 @@ if yaml_source
|
|||
libyaml = "libyaml.#$LIBEXT"
|
||||
$cleanfiles << libyaml
|
||||
$LOCAL_LIBS.prepend("$(LIBYAML) ")
|
||||
else # default to pre-installed libyaml
|
||||
pkg_config('yaml-0.1')
|
||||
dir_config('libyaml')
|
||||
find_header('yaml.h') or abort "yaml.h not found"
|
||||
find_library('yaml', 'yaml_get_version') or "libyaml not found"
|
||||
end
|
||||
|
||||
create_makefile 'psych' do |mk|
|
||||
|
|
Loading…
Reference in a new issue