The linker command can exceed the maximum argument limit on MinGW, especially for libavcodec. The objects list is now stored in a file and passed to the linker.
Unified · Split
| @@ -1,5 +1,6 @@ | |||
| 1 | *.a | 1 | *.a |
| 2 | *.o | 2 | *.o |
| 3 | *.objs | ||
| 3 | *.o.* | 4 | *.o.* |
| 4 | *.d | 5 | *.d |
| 5 | *.def | 6 | *.def |
| @@ -214,7 +214,7 @@ $(TOOLOBJS): | tools · 213 unmodified lines | |||
| 214 | 214 | ||
| 215 | OUTDIRS := $(OUTDIRS) $(dir $(OBJS) $(HOBJS) $(HOSTOBJS) $(SLIBOBJS) $(SHLIBOBJS) $(STLIBOBJS) $(TESTOBJS)) | 215 | OUTDIRS := $(OUTDIRS) $(dir $(OBJS) $(HOBJS) $(HOSTOBJS) $(SLIBOBJS) $(SHLIBOBJS) $(STLIBOBJS) $(TESTOBJS)) |
| 216 | 216 | ||
| 217 | CLEANSUFFIXES = *.d *.gcda *.gcno *.h.c *.ho *.map *.o *.pc *.ptx *.ptx.gz *.ptx.c *.ver *.version *$(DEFAULT_X86ASMD).asm *~ *.ilk *.pdb | 217 | CLEANSUFFIXES = *.d *.gcda *.gcno *.h.c *.ho *.map *.o *.objs *.pc *.ptx *.ptx.gz *.ptx.c *.ver *.version *$(DEFAULT_X86ASMD).asm *~ *.ilk *.pdb |
| 218 | LIBSUFFIXES = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a | 218 | LIBSUFFIXES = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a |
| 219 | 219 | ||
| 220 | define RULES | 220 | define RULES |
| @@ -35,8 +35,10 @@ OBJS += $(SHLIBOBJS) · 34 unmodified lines | |||
| 35 | endif | 35 | endif |
| 36 | $(SUBDIR)$(LIBNAME): $(OBJS) $(STLIBOBJS) | 36 | $(SUBDIR)$(LIBNAME): $(OBJS) $(STLIBOBJS) |
| 37 | $(RM) $@ | 37 | $(RM) $@ |
| 38 | $(AR) $(ARFLAGS) $(AR_O) $^ | 38 | $(Q)echo $^ > $@.objs |
| 39 | $(AR) $(ARFLAGS) $(AR_O) @$@.objs | ||
| 39 | $(RANLIB) $@ | 40 | $(RANLIB) $@ |
| 41 | -$(RM) $@.objs | ||
| 40 | 42 | ||
| 41 | install-headers: install-lib$(NAME)-headers install-lib$(NAME)-pkgconfig | 43 | install-headers: install-lib$(NAME)-headers install-lib$(NAME)-pkgconfig |
| 42 | 44 | ||
| @@ -66,8 +68,10 @@ $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR) · 23 unmodified lines | |||
| 66 | 68 | ||
| 67 | $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SHLIBOBJS) $(SLIBOBJS) $(SUBDIR)lib$(NAME).ver | 69 | $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SHLIBOBJS) $(SLIBOBJS) $(SUBDIR)lib$(NAME).ver |
| 68 | $(SLIB_CREATE_DEF_CMD) | 70 | $(SLIB_CREATE_DEF_CMD) |
| 69 | $$(LD) $(SHFLAGS) $(LDFLAGS) $(LDSOFLAGS) $$(LD_O) $$(filter %.o,$$^) $(FFEXTRALIBS) | 71 | $(Q)echo $$(filter %.o,$$^) > $$@.objs |
| 72 | $$(LD) $(SHFLAGS) $(LDFLAGS) $(LDSOFLAGS) $$(LD_O) @$$@.objs $(FFEXTRALIBS) | ||
| 70 | $(SLIB_EXTRA_CMD) | 73 | $(SLIB_EXTRA_CMD) |
| 74 | -$(RM) $$@.objs | ||
| 71 | 75 | ||
| 72 | ifdef SUBDIR | 76 | ifdef SUBDIR |
| 73 | $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(DEP_LIBS) | 77 | $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(DEP_LIBS) |