summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-06-30 15:14:55 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-06-30 15:14:55 +0000
commit6be7e5cbf85f85224cf740abc9456879281c94bf (patch)
treedbba2c3c7e76be0c029761757eb13ca9d076ff1d
parentc1c08a1147ef778cda87aea6d9ff75108fe6d513 (diff)
downloadruby-6be7e5cbf85f85224cf740abc9456879281c94bf.tar.gz
ruby-6be7e5cbf85f85224cf740abc9456879281c94bf.tar.xz
ruby-6be7e5cbf85f85224cf740abc9456879281c94bf.zip
* configure.in: should test isinf for Solaris with GCC compiler.
a patch from <ville.mattila at stonesoft.com>. [ruby-core:07791] * configure.in: -shared patch from Andrew Morrow <andrew.c.morrow at gmail.com>. [ruby-core:08100] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@10437 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--configure.in3
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 6ccea179e..feeb07eeb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,10 @@
Fri Jun 30 23:46:23 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* configure.in: should test isinf for Solaris with GCC compiler.
- [ruby-core:08100]
+ a patch from <ville.mattila at stonesoft.com>. [ruby-core:07791]
+
+ * configure.in: -shared patch from Andrew Morrow
+ <andrew.c.morrow at gmail.com>. [ruby-core:08100]
Thu Jun 29 18:58:51 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
diff --git a/configure.in b/configure.in
index 0385010e1..dbc9eb148 100644
--- a/configure.in
+++ b/configure.in
@@ -912,10 +912,9 @@ if test "$with_dln_a_out" != yes; then
: ${LIBPATHENV=SHLIB_PATH}
rb_cv_dlopen=yes;;
solaris*) if test "$GCC" = yes; then
- : ${LDSHARED='$(CC) -Wl,-G'}
+ : ${LDSHARED='$(CC) -shared'}
if test "$rb_cv_prog_gnu_ld" = yes; then
LDFLAGS="$LDFLAGS -Wl,-E"
- LDSHARED="$LDSHARED -shared"
fi
else
: ${LDSHARED='ld -G'}