diff options
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. |