summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-08-06 08:28:52 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-08-06 08:28:52 +0000
commit5796f6bef27e9b7479f2d8906b1ac3d0c6ac9bc8 (patch)
tree4f9f818a03dea4cdc77eaf95cef3aa27e2e25e4f /lib
parenta4d5c0fa7bbba175f514fbfe2a3e1d8c0fd755aa (diff)
downloadruby-5796f6bef27e9b7479f2d8906b1ac3d0c6ac9bc8.tar.gz
ruby-5796f6bef27e9b7479f2d8906b1ac3d0c6ac9bc8.tar.xz
ruby-5796f6bef27e9b7479f2d8906b1ac3d0c6ac9bc8.zip
* lib/mkmf.rb (have_library): treat nil function name as "main".
(ruby-bugs:PR#1083) git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@4338 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/mkmf.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 5d63277db..d21fa4f8b 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -446,14 +446,14 @@ def checking_for(m)
r
end
-def have_library(lib, func="main")
- func &&= ((m = "#{func}() in "; func) unless func.empty?)
- checking_for "#{m}-l#{lib}" do
+def have_library(lib, func=nil)
+ func = "main" if !func or func.empty?
+ checking_for "#{func}() in -l#{lib}" do
if COMMON_LIBS.include?(lib)
true
else
libs = append_library($libs, lib)
- if !func || try_func(func, libs)
+ if try_func(func, libs)
$libs = libs
true
else