diff options
| author | Edouard Oger <eoger@fastmail.com> | 2019-08-07 21:21:17 +0000 |
|---|---|---|
| committer | Edouard Oger <eoger@fastmail.com> | 2019-08-07 21:21:17 +0000 |
| commit | 9f57aafbdda50da15fd33eeaa4937a63a2631408 (patch) | |
| tree | a0241b8e0525129a3bc32b3b9d00091be2fde4b7 | |
| parent | 23b3f820e452a508d01acfd435d9ca7675c9681c (diff) | |
| download | nspr-hg-9f57aafbdda50da15fd33eeaa4937a63a2631408.tar.gz | |
Bug 1561953 - Filter out PR version files in static library build. r=glandiumNSPR_4_22_BETA2
Differential Revision: https://phabricator.services.mozilla.com/D36380
| -rw-r--r-- | config/rules.mk | 7 |
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) |