diff options
author | nagachika <nagachika@ruby-lang.org> | 2023-02-23 15:14:27 +0900 |
---|---|---|
committer | nagachika <nagachika@ruby-lang.org> | 2023-02-23 15:14:27 +0900 |
commit | 0602df301cd76a3f1b444c4742b288bc6aed80ac (patch) | |
tree | 24511a9a3cfdf00dd196475ac22b86e70787ce6e /lib | |
parent | 9f072e9ae1bae2d76334c9e97a47280779768859 (diff) |
merge revision(s) 613fca01486e47dee9364a2fd86b5f5e77fe23c8: [Backport #19189]
[Bug #19189] Fallback to the default "pkg-config"
---
lib/mkmf.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Diffstat (limited to 'lib')
-rw-r--r-- | lib/mkmf.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 2305641b61..be3be8517b 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1866,7 +1866,7 @@ SRC if pkgconfig = with_config("#{pkg}-config") and find_executable0(pkgconfig) # if and only if package specific config command is given elsif ($PKGCONFIG ||= - (pkgconfig = with_config("pkg-config", RbConfig::CONFIG["PKG_CONFIG"])) && + (pkgconfig = with_config("pkg-config") {config_string("PKG_CONFIG") || "pkg-config"}) && find_executable0(pkgconfig) && pkgconfig) and xsystem([*envs, $PKGCONFIG, "--exists", pkg]) # default to pkg-config command |