Commit 4f46fc6d authored by Guido van Rossum's avatar Guido van Rossum

When we have signalmodule.o, remove intrcheck.o as well as sigcheck.o.

parent aa61505f
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment