summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-12-29 16:10:24 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-12-29 16:10:24 +0000
commitb0838b4a36535fcc3a8cc1195469d92ec881390c (patch)
treee403715e73edb68c6206444897135109da372856
parent99ed64776e9dde75cfa0cc504ed5bf7bada04048 (diff)
downloadruby-b0838b4a36535fcc3a8cc1195469d92ec881390c.tar.gz
ruby-b0838b4a36535fcc3a8cc1195469d92ec881390c.tar.xz
ruby-b0838b4a36535fcc3a8cc1195469d92ec881390c.zip
* ext/extmk.rb.in, lib/mkmf.rb (have_library): accept -lm
unconditionally on mswin32/mingw32. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@1945 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/extmk.rb.in1
-rw-r--r--lib/mkmf.rb1
3 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 6d6aaef83..1125ca4e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Dec 30 00:59:16 2001 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * ext/extmk.rb.in, lib/mkmf.rb (have_library): accept -lm
+ unconditionally on mswin32/mingw32.
+
Fri Dec 28 14:39:05 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
* array.c (rb_cmpint): fixed typo.
diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in
index 0652ac2e0..86dd67e55 100644
--- a/ext/extmk.rb.in
+++ b/ext/extmk.rb.in
@@ -196,6 +196,7 @@ def have_library(lib, func="main")
if func && func != ""
libs = append_library($libs, lib)
if /mswin32|mingw/ =~ RUBY_PLATFORM
+ return true if lib == 'm'
r = try_link(<<"SRC", libs)
#include <windows.h>
#include <winsock.h>
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index fb6253b3f..9972fbdb1 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -182,6 +182,7 @@ def have_library(lib, func="main")
if func && func != ""
libs = append_library($libs, lib)
if /mswin32|mingw/ =~ RUBY_PLATFORM
+ return true if lib == 'm'
r = try_link(<<"SRC", libs)
#include <windows.h>
#include <winsock.h>