diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-05-14 00:04:36 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-05-14 00:04:36 +0000 |
| commit | f37f881a580b923ec2e30dbc98508c5dabe8c7d8 (patch) | |
| tree | c12b67d157017e7881e4cecef156bc7c772970d2 | |
| parent | fc9bc883903b83f84b8458073d77bad7ac367990 (diff) | |
| download | ruby-f37f881a580b923ec2e30dbc98508c5dabe8c7d8.tar.gz | |
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
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/mkmf.rb | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Sat May 14 09:04:34 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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 <nobu@ruby-lang.org> * 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| |