Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Must remove conflicting files from archive 

*before* adding signalmodule.o, because some ar programs
are too smart for us...
This commit is contained in:
Guido van Rossum 1997-08-21 02:30:20 +00:00
parent 08157f8db6
commit bae6523a75
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Modules/Makefile.pre.in
View File

@ -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.