diff --git a/ChangeLog b/ChangeLog
index ddcd371075e57d48c0f9696c89a354f462ae66d5..2a680ac98461ffadce14f724f8973a2e1811b2aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR libgcj/17311
+	* ltmain.sh: Don't use "$finalize_rpath" for compile.
+
 2006-02-20  Paolo Bonzini  <bonzini@gnu.org>
 
 	PR bootstrap/25670
diff --git a/ltmain.sh b/ltmain.sh
index ec2e2ac5adedd3202a3ee7d3d0f8d11005e4f9cc..d5173bc463243ff5518d3bd40cf8d318ff6f5b24 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -3550,7 +3550,7 @@ EOF
       # Now hardcode the library paths
       rpath=
       hardcode_libdirs=
-      for libdir in $compile_rpath $finalize_rpath; do
+      for libdir in $compile_rpath; do
 	if test -n "$hardcode_libdir_flag_spec"; then
 	  if test -n "$hardcode_libdir_separator"; then
 	    if test -z "$hardcode_libdirs"; then