Changeset 1394 for trunk/src/gcc/ltmain.sh

Timestamp:

Apr 28, 2004, 6:58:06 AM (21 years ago)

Author:

bird

Message:

#1040: Joined the GCC 3.3.3 with the trunk.

File:

• trunk/src/gcc/ltmain.sh (modified) (2 diffs, 1 prop)

trunk/src/gcc/ltmain.sh

@@ -2607 +2607 @@
 
         osf)
-          major=`expr $current - $age`
+          major=.`expr $current - $age`
           versuffix=".$current.$age.$revision"
           verstring="$current.$age.$revision"
@@ -4248 +4248 @@
           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