diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2022-09-11 16:40:20 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2022-10-02 15:19:14 +0900 |
| commit | de9c612d6342ae2ea5ae1e46b27abecf17c439b5 (patch) | |
| tree | a15c5028e151ba3b5cbba7ebcd57aec4cd2d79a9 | |
| parent | 7f1ca666424849134990d022266bcd4d6636465f (diff) | |
Also the tests should use the configured pkg-config
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/6482
| -rw-r--r-- | test/mkmf/test_pkg_config.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/mkmf/test_pkg_config.rb b/test/mkmf/test_pkg_config.rb index 72efb4ba81..f6a960c7d9 100644 --- a/test/mkmf/test_pkg_config.rb +++ b/test/mkmf/test_pkg_config.rb @@ -3,7 +3,7 @@ require_relative 'base' require 'shellwords' class TestMkmfPkgConfig < TestMkmf - PKG_CONFIG = find_executable0("pkg-config") + PKG_CONFIG = config_string("PKG_CONFIG") {|path| find_executable0(path)} def setup super @@ -26,7 +26,7 @@ class TestMkmfPkgConfig < TestMkmf Cflags: -I${includedir}/cflags-I --cflags-other EOF - @pkg_config_path, ENV["PKG_CONFIG_PATH"] = ENV["PKG_CONFIG_PATH"], File.join(Dir.pwd, "fixtures") + @pkg_config_path, ENV["PKG_CONFIG_PATH"] = ENV["PKG_CONFIG_PATH"], @fixtures_dir end end |