From 3dbc777c7f30409b844c38641941d5e7f90af97e Mon Sep 17 00:00:00 2001
From: Mans Rullgard <mans@mansr.com>
Date: Mon, 17 Sep 2012 23:56:32 +0100
Subject: [PATCH] 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>
---
configure | 13 +++++++++++++
library.mak | 2 +-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index 2d400c0cedb..8a7eaf4f314 100755
--- a/configure
+++ b/configure
@@ -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 d89050e84a2..19f05f9e871 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
--
GitLab