Fix aix --with-gnu-ld build failure reported by Brendan.

	* collect2.c (main): Ignore do_collecting when COLLECT_EXPORT_LIST.

From-SVN: r19704

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5b4027319abef995e512171c5f04e794d9ff9f46..21e0b8998a6a960b577f9755e9388f9bd8265c2f 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+Tue May 12 20:05:57 1998  Jim Wilson  <wilson@cygnus.com>
+
+       * collect2.c (main): Ignore do_collecting when COLLECT_EXPORT_LIST.
+
 Wed May 13 03:23:45 1998  J"orn Rennecke <amylaar@cygnus.co.uk>
 
        * reload1.c (gen_reload): Create REG_EQUIV notes.

diff --git a/gcc/collect2.c b/gcc/collect2.c
index 0cba7ef144b1e14b709eee58d3fc26ce56241b1c..d51a4572b554bb2d833ed2dd95e944255c50f1b7 100644 (file)
--- a/gcc/collect2.c
+++ b/gcc/collect2.c
@@ -1428,7 +1428,11 @@ main (argc, argv)
 
   /* If -r or they will be run via some other method, do not build the
      constructor or destructor list, just return now.  */
-  if (rflag || ! do_collecting)
+  if (rflag
+#ifndef COLLECT_EXPORT_LIST
+      || ! do_collecting
+#endif
+      )
     {
 #ifdef COLLECT_EXPORT_LIST
       /* But make sure we delete the export file we may have created.  */