From: Loren J. Rittle <ljrittle@acm.org>
Date: Thu, 6 Jun 2002 06:12:58 +0000 (+0000)
Subject: ltmain.sh: Detect and handle object name conflicts while piecewise linking a static... 
X-Git-Tag: releases/gcc-3.1.1~199
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89d757b90949f2e7b8d0334932fc4e3d2f320729;p=thirdparty%2Fgcc.git

ltmain.sh: Detect and handle object name conflicts while piecewise linking a static library.

2002-06-05  Loren J. Rittle <ljrittle@acm.org>

	* ltmain.sh: Detect and handle object name conflicts while
	piecewise linking a static library.

From-SVN: r54303
---

diff --git a/ChangeLog b/ChangeLog
index 060bd6c87352..a845620448a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-05  Loren J. Rittle <ljrittle@acm.org>
+
+	* ltmain.sh: Detect and handle object name conflicts while
+	piecewise linking a static library.
+
 2002-05-14  Release Manager
 
 	* GCC 3.1 Released.
diff --git a/ltmain.sh b/ltmain.sh
index c3547e5a5616..92526b60b795 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -4247,6 +4247,20 @@ fi\
           objlist=
           concat_cmds=
           save_oldobjs=$oldobjs
+	  # GNU ar 2.10+ was changed to match POSIX; thus no paths are
+	  # encoded into archives.  This makes 'ar r' malfunction in
+	  # this piecewise linking case whenever conflicting object
+	  # names appear in distinct ar calls; check, warn and compensate.
+          if (for obj in $save_oldobjs
+	    do
+	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
+	    done | sort | sort -uc >/dev/null 2>&1); then
+	    :
+	  else
+	    $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
+	    $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
+	    AR_FLAGS=cq
+	  fi
           for obj in $save_oldobjs
           do
             oldobjs="$objlist $obj"