Skip to content

Commit 740d400

Browse files
committed
ffbuild: use response files only if ar accepts them
1 parent 2de14c3 commit 740d400

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed

configure

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5230,6 +5230,12 @@ else
52305230
ar_o='$@'
52315231
fi
52325232

5233+
if $ar 2>&1 | grep -qi "@.*file"; then
5234+
ar_objs="true"
5235+
else
5236+
ar_objs=""
5237+
fi
5238+
52335239
add_cflags $extra_cflags
52345240
add_cxxflags $extra_cxxflags
52355241
add_objcflags $extra_objcflags
@@ -8133,6 +8139,7 @@ DEPX86ASM=$x86asmexe
81338139
DEPX86ASMFLAGS=\$(X86ASMFLAGS)
81348140
AR=$ar
81358141
ARFLAGS=$arflags
8142+
AR_OBJS=$ar_objs
81368143
AR_O=$ar_o
81378144
AR_CMD=$ar
81388145
NM_CMD=$nm

ffbuild/library.mak

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,12 @@ OBJS += $(SHLIBOBJS)
3535
endif
3636
$(SUBDIR)$(LIBNAME): $(OBJS) $(STLIBOBJS)
3737
$(RM) $@
38+
ifeq ($(AR_OBJS),true)
3839
$(Q)echo $^ > [email protected]
3940
$(AR) $(ARFLAGS) $(AR_O) @[email protected]
41+
else
42+
$(AR) $(ARFLAGS) $(AR_O) $^
43+
endif
4044
$(RANLIB) $@
4145
4246

@@ -68,8 +72,12 @@ $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR)
6872

6973
$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SHLIBOBJS) $(SLIBOBJS) $(SUBDIR)lib$(NAME).ver
7074
$(SLIB_CREATE_DEF_CMD)
75+
ifeq ($(AR_OBJS),true)
7176
$(Q)echo $$(filter %.o,$$^) > [email protected]
7277
$$(LD) $(SHFLAGS) $(LDFLAGS) $(LDSOFLAGS) $$(LD_O) @[email protected] $(FFEXTRALIBS)
78+
else
79+
$$(LD) $(SHFLAGS) $(LDFLAGS) $(LDSOFLAGS) $$(LD_O) $$(filter %.o,$$^) $(FFEXTRALIBS)
80+
endif
7381
$(SLIB_EXTRA_CMD)
7482
-$(RM) $$@.objs
7583

0 commit comments

Comments
 (0)