Skip to content

Commit

Permalink
Merge pull request #2505 from sparklemotion/2487-extconf-fix-for-miss…
Browse files Browse the repository at this point in the history
…ing-libiconv

ext: systems missing libiconv will see a relevant error message
  • Loading branch information
flavorjones authored Apr 6, 2022
2 parents d2ea924 + 78f4a57 commit 9518c86
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions ext/nokogiri/extconf.rb
Original file line number Diff line number Diff line change
Expand Up @@ -400,8 +400,8 @@ def iconv_configure_flags
return ["--with-iconv=yes"]
end

config = preserving_globals { have_package_configuration("libiconv") }
if config && try_link_iconv("pkg-config libiconv") { have_package_configuration("libiconv") }
config = preserving_globals { pkg_config("libiconv") }
if config && try_link_iconv("pkg-config libiconv") { pkg_config("libiconv") }
cflags, ldflags, libs = config

return [
Expand Down

0 comments on commit 9518c86

Please sign in to comment.