From f37f881a580b923ec2e30dbc98508c5dabe8c7d8 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 14 May 2016 00:04:36 +0000 Subject: lib/mkmf.rb: use xsystem to pkg-config --exists * lib/mkmf.rb (pkg_config): use xsystem consistently to set up library path environment variable as well as latter pkg-config calls. [ruby-dev:49619] [Bug #12379] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54999 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ lib/mkmf.rb | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 08e62a2a52..9dd58e7c5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat May 14 09:04:34 2016 Nobuyoshi Nakada + + * lib/mkmf.rb (pkg_config): use xsystem consistently to set up + library path environment variable as well as latter pkg-config + calls. [ruby-dev:49619] [Bug #12379] + Sat May 14 00:16:54 2016 Nobuyoshi Nakada * random.c (make_seed_value): append leading-zero-guard and get diff --git a/lib/mkmf.rb b/lib/mkmf.rb index e01ec6eaa8..eee42d0e51 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1791,7 +1791,7 @@ SRC elsif ($PKGCONFIG ||= (pkgconfig = with_config("pkg-config", ("pkg-config" unless CROSS_COMPILING))) && find_executable0(pkgconfig) && pkgconfig) and - system("#{$PKGCONFIG} --exists #{pkg}") + xsystem("#{$PKGCONFIG} --exists #{pkg}") # default to pkg-config command pkgconfig = $PKGCONFIG get = proc {|opt| -- cgit v1.2.3