1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use the dedicated constants LIBARG and LIBPATHFLAG

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2024-12-02 22:38:24 +09:00 committed by Nobuyoshi Nakada
parent be7e5f1f85
commit b19fcd02fa
Notes: git 2024-12-23 02:52:33 +00:00 
Merged: https://github.com/ruby/ruby/pull/9815
1 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/mkmf.rb
View File

@ -1980,32 +1980,22 @@ SRC
pkgconfig = nil
end
if pkgconfig
has_ms_win_syntax = false
if $mswin
has_ms_win_syntax = xpopen([pkgconfig, "--help"]).read.include?('msvc-syntax')
if has_ms_win_syntax
args << "--msvc-syntax"
else
Logging.message("WARNING: #{pkgconfig} does not support the --msvc-syntax. Try using a recent pkgconf instead")
end
end
get = proc {|opts|
opts = Array(opts).map { |o| "--#{o}" }
opts = xpopen([*envs, pkgconfig, *opts, *args], err:[:child, :out], &:read)
Logging.open {puts opts.each_line.map{|s|"=> #{s.inspect}"}}
if $?.success?
opts = opts.strip
if $mswin and not has_ms_win_syntax
opts = Shellwords.shellwords(opts).map { |s|
if s.start_with?('-l')
"#{s[2..]}.lib"
elsif s.start_with?('-L')
"/libpath:#{s[2..]}"
else
s
end
}.quote.join(" ")
end
libarg, libpath = LIBARG, LIBPATHFLAG.strip
opts = opts.shellsplit.map { |s|
if s.start_with?('-l')
libarg % s[2..]
elsif s.start_with?('-L')
libpath % s[2..]
else
s
end
}.quote.join(" ")
opts
end
}