summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--configure.in2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 27bd6a2f3a..013584ac40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Aug 5 23:08:39 2011 Naohisa Goto <ngotogenome@gmail.com>
+
+ * backport r32845 from trunk.
+
+ * configure.in: when Solaris cc, use $(CC) to link shared libs.
+
Fri Aug 5 22:16:20 2011 Naohisa Goto <ngotogenome@gmail.com>
* numeric.c (rb_infinity, rb_nan): use WORDS_BIGENDIAN to get endian.
diff --git a/configure.in b/configure.in
index 9b800bd602..e742e74ae3 100644
--- a/configure.in
+++ b/configure.in
@@ -2026,7 +2026,7 @@ if test "$with_dln_a_out" != yes; then
LDFLAGS="$LDFLAGS -Wl,-E"
fi
else
- : ${LDSHARED='ld -G'}
+ : ${LDSHARED='$(CC) -G'}
fi
rb_cv_dlopen=yes],
[sunos*], [ : ${LDSHARED='ld -assert nodefinitions'}