merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 82547e2..0bd3266 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-25  Daniel Jacobowitz  <drow@false.org>
+
+       * Makefile.in: Add .NOEXPORT.
+
 2004-04-29  Douglas B Rupp  <rupp@gnat.com>
 
        * mkstemps.c (mkstemps) [VMS]: Remove special open option. Update

diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index 78cc4bc..9f95c01 100644 (file)
--- a/libiberty/Makefile.in
+++ b/libiberty/Makefile.in
@@ -1057,3 +1057,6 @@ $(CONFIGURED_OFILES): stamp-picdir
        else true; fi
        $(COMPILE.c) $(srcdir)/xstrerror.c $(OUTPUT_OPTION)
 
+# Don't export variables to the environment, in order to not confuse
+# configure.
+.NOEXPORT: