kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* lib/mkmf.rb (have_library): treat nil function name as "main".

Browse source 
(ruby-bugs:PR#1083)


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4338 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2003-08-06 08:28:52 +00:00
parent 94d17c1f1f
commit fb5efbaaec
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,4 +1,4 @@
Wed Aug 6 12:11:10 2003 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Aug 6 17:28:10 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/extmk.rb (extmake): pass LIBPATH to make ruby. [ruby-dev:21137] * ext/extmk.rb (extmake): pass LIBPATH to make ruby. [ruby-dev:21137]
@ -11,8 +11,8 @@ Wed Aug 6 12:11:10 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (macro_defined?): append newline to src unless ended * lib/mkmf.rb (macro_defined?): append newline to src unless ended
with it. with it.
* lib/mkmf.rb (have_library): allow nil function name to just * lib/mkmf.rb (have_library): treat nil function name as "main".
append a library. (ruby-bugs:PR#1083) (ruby-bugs:PR#1083)
* lib/mkmf.rb (pkg_config): should append additional libraries to * lib/mkmf.rb (pkg_config): should append additional libraries to
$libs but not $LIBS. [ruby-dev:21137] $libs but not $LIBS. [ruby-dev:21137]

8
lib/mkmf.rb
View file

@ -446,14 +446,14 @@ def checking_for(m)
r r
end end
def have_library(lib, func="main") def have_library(lib, func=nil)
func &&= ((m = "#{func}() in "; func) unless func.empty?) func = "main" if !func or func.empty?
checking_for "#{m}-l#{lib}" do checking_for "#{func}() in -l#{lib}" do
if COMMON_LIBS.include?(lib) if COMMON_LIBS.include?(lib)
true true
else else
libs = append_library($libs, lib) libs = append_library($libs, lib)
if !func || try_func(func, libs) if try_func(func, libs)
$libs = libs $libs = libs
true true
else else