diff --git a/ChangeLog b/ChangeLog
index 62bb31c8a6b42605b8eaad6345db1b758e37ef56..f062e758def9937d913aa32d4435f6da4406b007 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-21  Erik Edelmann  <eedelman@gcc.gnu.org>
 
 	* MAINTAINERS (Write After Approval):  Remove myself.
diff --git a/ltmain.sh b/ltmain.sh
index 474423aaf10e0f6db7c07e92998189547d242c8d..219823fc45db08bcbb44cda74651d3f1e8a2c0b6 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -3674,7 +3674,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