summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/rules.mk7
1 files changed, 5 insertions, 2 deletions
diff --git a/config/rules.mk b/config/rules.mk
index 1c8fdc9b..84dff561 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -280,10 +280,13 @@ ifdef ENABLE_STRIP
$(STRIP) $@
endif
-$(LIBRARY): $(OBJS)
+# Same as OBJS, but without any file that matches p*vrsion.o, since these
+# collide for static libraries, and are not useful for that case anyway.
+STATICLIB_OBJS = $(filter-out $(OBJDIR)/p%vrsion.$(OBJ_SUFFIX),$(OBJS))
+$(LIBRARY): $(STATICLIB_OBJS)
@$(MAKE_OBJDIR)
rm -f $@
- $(AR) $(AR_FLAGS) $(OBJS) $(AR_EXTRA_ARGS)
+ $(AR) $(AR_FLAGS) $(STATICLIB_OBJS) $(AR_EXTRA_ARGS)
$(RANLIB) $@
ifeq ($(OS_TARGET), OS2)