diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-02 21:01:38 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-02 21:01:38 +0100 |
| commit | f7d30133221896638f7bf4f66c504255c4b14f48 (patch) | |
| tree | 5f3e07a049f388a3a309a615b8884318f6668a98 /nsprpub/config/rules.mk | |
| parent | 26b297510a11758727438df4669357a2a2bc42ce (diff) | |
| download | UXP-f7d30133221896638f7bf4f66c504255c4b14f48.tar UXP-f7d30133221896638f7bf4f66c504255c4b14f48.tar.gz UXP-f7d30133221896638f7bf4f66c504255c4b14f48.tar.lz UXP-f7d30133221896638f7bf4f66c504255c4b14f48.tar.xz UXP-f7d30133221896638f7bf4f66c504255c4b14f48.zip | |
Issue #1338 - Part 1: Update NSPR to 4.24
Diffstat (limited to 'nsprpub/config/rules.mk')
| -rw-r--r-- | nsprpub/config/rules.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/nsprpub/config/rules.mk b/nsprpub/config/rules.mk index 1c8fdc9b8..84dff5617 100644 --- a/nsprpub/config/rules.mk +++ b/nsprpub/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) |