summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1997-08-20 22:45:52 (GMT)
committerGuido van Rossum <guido@python.org>1997-08-20 22:45:52 (GMT)
commit4f46fc6d577ad1756ce8d2485938fd02a45fa709 (patch)
treea8f1e8ecf74c07e4eb98258a7c6a76b291f3522f
parentaa61505fd222fb15cc2507c8a2a44dcfce0c971f (diff)
downloadcpython-4f46fc6d577ad1756ce8d2485938fd02a45fa709.zip
cpython-4f46fc6d577ad1756ce8d2485938fd02a45fa709.tar.gz
cpython-4f46fc6d577ad1756ce8d2485938fd02a45fa709.tar.bz2
When we have signalmodule.o, remove intrcheck.o as well as sigcheck.o.
-rw-r--r--Modules/Makefile.pre.in7
1 files changed, 4 insertions, 3 deletions
diff --git a/Modules/Makefile.pre.in b/Modules/Makefile.pre.in
index 6c5ddb1..42e6601 100644
--- a/Modules/Makefile.pre.in
+++ b/Modules/Makefile.pre.in
@@ -111,12 +111,13 @@ $(ASHAREDMODULE)$(SO): $(ASHAREDMODULESOBS)
$(ASHAREDMODULESEXTRA)
# This target is used by the master Makefile to add the objects to the library.
-# To deal with the conflict between signalmodule.o and sigcheck.o,
-# we remove the latter if we have the former.
+# 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)
$(AR) cr $(LIBRARY) $(OBJS)
-if ar x $(LIBRARY) signalmodule.o 2>/dev/null; \
- then ar d $(LIBRARY) sigcheck.o 2>/dev/null; true; \
+ then \
+ ar d $(LIBRARY) sigcheck.o intrcheck.o 2>/dev/null; true; \
else true; fi
touch add2lib