From: Guido van Rossum <guido@python.org>
Date: Thu, 21 Aug 1997 02:30:20 +0000 (+0000)
Subject: Must remove conflicting files from archive
X-Git-Tag: v1.5a4~343
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bae6523a758f8197250667582fe834553b8e61b8;p=python

Must remove conflicting files from archive
*before* adding signalmodule.o, because some ar programs
are too smart for us...
---

diff --git a/Modules/Makefile.pre.in b/Modules/Makefile.pre.in
index 42e6601a6f..a187b7b2c3 100644
--- a/Modules/Makefile.pre.in
+++ b/Modules/Makefile.pre.in
@@ -114,11 +114,13 @@ $(ASHAREDMODULE)$(SO): $(ASHAREDMODULESOBS)
 # To deal with the conflict between signalmodule.o and
 # sigcheck.o+intrcheck.o, we remove the latter two if we have the former.
 add2lib:	$(OBJS)
+		-for i in $(OBJS); do \
+		     if test "$$i" = "signalmodule.o"; then \
+		        ar d $(LIBRARY) sigcheck.o intrcheck.o 2>/dev/null; \
+			break; \
+		     fi; \
+		done
 		$(AR) cr $(LIBRARY) $(OBJS)
-		-if ar x $(LIBRARY) signalmodule.o 2>/dev/null; \
-		then \
-		  ar d $(LIBRARY) sigcheck.o intrcheck.o 2>/dev/null; true; \
-		else true; fi
 		touch add2lib
 
 # This target is used by the master Makefile to link the final binary.