diff --git a/ChangeLog b/ChangeLog
index 4906f11af3..19e4be16ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Aug  4 20:29:41 2011  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* configure.in: when Solaris cc, use $(CC) to link shared libs.
+
 Thu Aug  4 20:19:11 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
 	* error.c (report_bug): use a small message buffer instead of BUFSIZ.
diff --git a/configure.in b/configure.in
index 0236edb04e..7176fda353 100644
--- a/configure.in
+++ b/configure.in
@@ -2016,7 +2016,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'}