summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-01-25 09:00:50 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-01-25 09:00:50 +0000
commitcb2f5a91c12e9cd4798c7ba395924b8fdd1523ee (patch)
treed357dd5b219ff83c215bb53fa21e01fed14412e9
parent3b359789b92085ea0d1a2231b3d8ef279be9b63d (diff)
* configure.in (solaris): add '-shared' only for GNU ld.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@2017 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--configure.in7
-rw-r--r--version.h4
3 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 58d1f762c8..2041d21972 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jan 25 17:48:43 2002 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * configure.in (solaris): add '-shared' only for GNU ld.
+
Fri Jan 25 17:16:23 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
* class.c (rb_include_module): detect cyclic module inclusion.
diff --git a/configure.in b/configure.in
index bce15f0001..c2695e4279 100644
--- a/configure.in
+++ b/configure.in
@@ -530,8 +530,11 @@ if test "$with_dln_a_out" != yes; then
LDFLAGS="-Wl,-E"
rb_cv_dlopen=yes;;
solaris*) if test "$GCC" = yes; then
- LDSHARED='$(CC) -Wl,-G -shared'
- `$CC --print-prog-name=ld` -v 2>&1 | grep "GNU ld" > /dev/null && LDFLAGS="-Wl,-E"
+ LDSHARED='$(CC) -Wl,-G'
+ if `$CC --print-prog-name=ld` -v 2>&1 | grep "GNU ld" > /dev/null; then
+ LDFLAGS="-Wl,-E"
+ LDSHARED="$LDSHARED -shared"
+ fi
else
LDSHARED='ld -G'
fi
diff --git a/version.h b/version.h
index 0a813de254..70d5883658 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
#define RUBY_VERSION "1.6.6"
-#define RUBY_RELEASE_DATE "2002-01-23"
+#define RUBY_RELEASE_DATE "2002-01-25"
#define RUBY_VERSION_CODE 166
-#define RUBY_RELEASE_CODE 20020123
+#define RUBY_RELEASE_CODE 20020125