aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-05-11 16:54:10 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-05-11 16:54:10 +0000
commit6ff3a8e3bb6c6cf25c134300ebf9877907d739c1 (patch)
treedec19cadd8811fd170bb82d64e253c7c77ed7f40
parentd6d8ea91e9027ca0f27dacf378ce0819c46d6542 (diff)
downloadruby-6ff3a8e3bb6c6cf25c134300ebf9877907d739c1.tar.gz
mkmf.rb: fix conflict in have_library
* lib/mkmf.rb (try_func): get rid of conflict of declarations of main(). checking local symbol reference does not make sense. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54982 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/mkmf.rb13
2 files changed, 13 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 9f10118f16..75e98228b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu May 12 01:54:08 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/mkmf.rb (try_func): get rid of conflict of declarations of
+ main(). checking local symbol reference does not make sense.
+
Thu May 12 00:18:19 2016 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/Makefile.sub (HAVE_QSORT_S): use qsort_s only for Visual Studio
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 31bee93c97..e01ec6eaa8 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -748,6 +748,8 @@ int main() {printf("%"PRI_CONFTEST_PREFIX"#{neg ? 'd' : 'u'}\\n", conftest_const
decltype = proc {|x|"const volatile void *#{x}"}
when /\)$/
call = func
+ when nil
+ call = ""
else
call = "#{func}()"
decltype = proc {|x| "void ((*#{x})())"}
@@ -956,7 +958,10 @@ SRC
break noun = noun.send(meth, *args)
end
end
- msg << " #{pre} #{noun}" unless noun.empty?
+ unless noun.empty?
+ msg << " #{pre} " unless msg.empty?
+ msg << noun
+ end
end
msg
end
@@ -987,9 +992,8 @@ SRC
# <code>--with-FOOlib</code> configuration option.
#
def have_library(lib, func = nil, headers = nil, opt = "", &b)
- func = "main" if !func or func.empty?
lib = with_config(lib+'lib', lib)
- checking_for checking_message(func.funcall_style, LIBARG%lib, opt) do
+ checking_for checking_message(func && func.funcall_style, LIBARG%lib, opt) do
if COMMON_LIBS.include?(lib)
true
else
@@ -1013,10 +1017,9 @@ SRC
# library paths searched and linked against.
#
def find_library(lib, func, *paths, &b)
- func = "main" if !func or func.empty?
lib = with_config(lib+'lib', lib)
paths = paths.collect {|path| path.split(File::PATH_SEPARATOR)}.flatten
- checking_for checking_message(func.funcall_style, LIBARG%lib) do
+ checking_for checking_message(func && func.funcall_style, LIBARG%lib) do
libpath = $LIBPATH
libs = append_library($libs, lib)
begin