merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 82547e29bfee0e3ddde6bd4e86d4c49b271e0f2e..0bd3266ca327d7bb500bf995f80a0fe54a41287c 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 78cc4bca864daee537f2c5854a41b7cd38e981ba..9f95c01327f39d6b3addd7b4ec882081cbecc897 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: