diff options
| author | Mans Rullgard <mans@mansr.com> | 2012-09-17 23:56:32 +0100 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2012-09-19 14:09:50 +0100 |
| commit | 3dbc777c7f30409b844c38641941d5e7f90af97e (patch) | |
| tree | e0a5a7e6d6751c74f2adf46542f620af88ac69a2 | |
| parent | b16d001b628237c93529c2be169ea5af1be7c9d7 (diff) | |
| download | ffmpeg-3dbc777c7f30409b844c38641941d5e7f90af97e.tar.gz | |
build: support some non-standard ar variants
This adds support for the TI and Microsoft (lib.exe) variants of
the ar utility.
Signed-off-by: Mans Rullgard <mans@mansr.com>
| -rwxr-xr-x | configure | 13 | ||||
| -rw-r--r-- | library.mak | 2 |
2 files changed, 14 insertions, 1 deletions
@@ -2415,6 +2415,17 @@ if [ -z "$CC_DEPFLAGS" ] && [ "$dep_cc" != "$cc" ]; then DEPCCFLAGS=$_flags fi +if $ar 2>&1 | grep -q Microsoft; then + arflags="-nologo" + ar_o='-out:$@' +elif $ar 2>&1 | grep -q 'Texas Instruments'; then + arflags="rq" + ar_o='$@' +else + arflags="rc" + ar_o='$@' +fi + add_cflags $extra_cflags add_asflags $extra_cflags @@ -3645,6 +3656,8 @@ DEPASFLAGS=$DEPASFLAGS \$(CPPFLAGS) YASM=$yasmexe DEPYASM=$yasmexe AR=$ar +ARFLAGS=$arflags +AR_O=$ar_o RANLIB=$ranlib LN_S=$ln_s CPPFLAGS=$CPPFLAGS diff --git a/library.mak b/library.mak index d89050e84a..19f05f9e87 100644 --- a/library.mak +++ b/library.mak @@ -25,7 +25,7 @@ $(TESTOBJS): CPPFLAGS += -DTEST $(SUBDIR)$(LIBNAME): $(OBJS) $(RM) $@ - $(AR) rc $@ $^ $(EXTRAOBJS) + $(AR) $(ARFLAGS) $(AR_O) $^ $(EXTRAOBJS) $(RANLIB) $@ install-headers: install-lib$(NAME)-headers install-lib$(NAME)-pkgconfig |