diff options
| author | nagachika <nagachika@ruby-lang.org> | 2022-10-21 15:35:24 +0900 |
|---|---|---|
| committer | nagachika <nagachika@ruby-lang.org> | 2022-10-21 15:35:24 +0900 |
| commit | 939f8c0e665f49ce7b438b796a2e4b2785f290d8 (patch) | |
| tree | d2ecec00a4e27617a3e5b1e0d115b78a0f883f4f /test | |
| parent | e8cb6dae740d5c5613854f8b280a7b0cf5a0fa17 (diff) | |
merge revision(s) de9c612d6342ae2ea5ae1e46b27abecf17c439b5:
Also the tests should use the configured pkg-config
---
test/mkmf/test_pkg_config.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Diffstat (limited to 'test')
| -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 |