diff options
| author | Guido van Rossum <guido@python.org> | 1997-08-21 02:30:20 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 1997-08-21 02:30:20 (GMT) |
| commit | bae6523a758f8197250667582fe834553b8e61b8 (patch) | |
| tree | 32a4abc1862b103bdbad7d7d8579309bbd1f376f /Modules/Makefile.pre.in | |
| parent | 08157f8db6e3b2f4170933217f127ab2d8f997c5 (diff) | |
| download | cpython-bae6523a758f8197250667582fe834553b8e61b8.zip cpython-bae6523a758f8197250667582fe834553b8e61b8.tar.gz cpython-bae6523a758f8197250667582fe834553b8e61b8.tar.bz2 | |
Must remove conflicting files from archive
*before* adding signalmodule.o, because some ar programs
are too smart for us...
Diffstat (limited to 'Modules/Makefile.pre.in')
| -rw-r--r-- | Modules/Makefile.pre.in | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Modules/Makefile.pre.in b/Modules/Makefile.pre.in index 42e6601..a187b7b 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. |