diff --git a/ChangeLog b/ChangeLog
index 881cfd3e6..f2eeddf06 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-13 Alexandre Oliva  <oliva@lsd.ic.unicamp.br>
+
+	* ltmain.sh: Preserve in relink_command any environment
+	variables that may affect the linker behavior.
+
 Fri May 12 11:23:17 2000  Jeffrey A Law  (law@cygnus.com)
 
 	* config.sub (basic_machine): Recognize hppa64 as a valid cpu type.
diff --git a/ltmain.sh b/ltmain.sh
index c32939ee8..a171502c7 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -2779,6 +2779,11 @@ static const void *lt_preloaded_setup() {
 
       # Quote the relink command for shipping.
       if test -n "$relink_command"; then
+        # Preserve any variables that may affect compiler behavior
+	variables_saved_for_relink="GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+	for var in $variables_saved_for_relink; do
+	  relink_command="$var=\""`eval \$echo \"X'$'$var\" | $Xsed -e "$sed_quote_subst"`"\"; export $var; $relink_command"
+	done
 	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
       fi