diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-23 14:44:45 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-23 14:44:45 +0000 |
| commit | e54cd2bd97b4da5e9a02ab35cdb3f75f4b645b06 (patch) | |
| tree | 6d536964933a294d3787062e55b000a1c4213e8d /lib/mkmf.rb | |
| parent | 400d2d9d0394dda6f201eb0c92c056adfe5ca4db (diff) | |
mkmf.rb: mingw64+MSYS pkg-config fix
* lib/mkmf.rb (MakeMakefile#pkg_config): strip all white spaces for
mingw64+MSYS pkg-config which errouneously emits extra newlines.
[ruby-core:47998] [Bug #7163]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37820 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/mkmf.rb')
| -rw-r--r-- | lib/mkmf.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index ded4e89814..83ff06f029 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1,3 +1,4 @@ +# -*- coding: us-ascii -*- # module to create Makefile for extension modules # invoke like: ruby -r mkmf extconf.rb @@ -1668,16 +1669,16 @@ SRC def pkg_config(pkg) if pkgconfig = with_config("#{pkg}-config") and find_executable0(pkgconfig) # iff package specific config command is given - get = proc {|opt| `#{pkgconfig} --#{opt}`.chomp} + get = proc {|opt| `#{pkgconfig} --#{opt}`.strip} elsif ($PKGCONFIG ||= (pkgconfig = with_config("pkg-config", ("pkg-config" unless CROSS_COMPILING))) && find_executable0(pkgconfig) && pkgconfig) and system("#{$PKGCONFIG} --exists #{pkg}") # default to pkg-config command - get = proc {|opt| `#{$PKGCONFIG} --#{opt} #{pkg}`.chomp} + get = proc {|opt| `#{$PKGCONFIG} --#{opt} #{pkg}`.strip} elsif find_executable0(pkgconfig = "#{pkg}-config") # default to package specific config command, as a last resort. - get = proc {|opt| `#{pkgconfig} --#{opt}`.chomp} + get = proc {|opt| `#{pkgconfig} --#{opt}`.strip} end if get and try_ldflags(ldflags = get['libs']) cflags = get['cflags'] |