From: simonmar <unknown>
Date: Fri, 21 Mar 2003 10:59:20 +0000 (+0000)
Subject: [project @ 2003-03-21 10:59:20 by simonmar]
X-Git-Tag: Approx_11550_changesets_converted~1053
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=63a5c6464d8961189263b19070affdab9051add6;p=ghc-hetmet.git

[project @ 2003-03-21 10:59:20 by simonmar]
GNU ar seems to have trouble with duplicate object file names if you
use the 's' modifier, so detect GNU ar here and use a simple 'ar q'
command to create archives.

This bug was tickled when I replaced an 'ar q' with '$(AR)' in
target.mk yesterday: the default $(AR) is 'ar clqs'.
---

diff --git a/aclocal.m4 b/aclocal.m4
index 3019dee..6628be4 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $Id: aclocal.m4,v 1.113 2003/01/27 16:41:18 simonmar Exp $
+dnl $Id: aclocal.m4,v 1.114 2003/03/21 10:59:20 simonmar Exp $
 dnl 
 dnl Extra autoconf macros for the Glasgow fptools
 dnl
@@ -337,7 +337,13 @@ if test -z "$ArCmdRaw"; then
     echo "You don't seem to have ar in your PATH...I have no idea how to make a library"
     exit 1;
 fi
-if $ArCmdRaw clqsZ conftest.a >/dev/null 2>/dev/null; then
+dnl GNU ar needs special treatment: it appears to have problems with
+dnl object files with the same name if you use the 's' modifier, but
+dnl simple 'ar q' works fine, and doesn't need a separate ranlib.
+if $ArCmdRaw --version | grep 'GNU' >/dev/null 2>/dev/null; then
+    ArCmdArgs='q'
+    NeedRanLib=''
+elif $ArCmdRaw clqsZ conftest.a >/dev/null 2>/dev/null; then
     ArCmdArgs="clqsZ"
     NeedRanLib=''
 elif $ArCmdRaw clqs conftest.a >/dev/null 2>/dev/null; then