diff options
| author | eadler <eadler@FreeBSD.org> | 2012-12-06 01:31:25 +0000 |
|---|---|---|
| committer | eadler <eadler@FreeBSD.org> | 2012-12-06 01:31:25 +0000 |
| commit | 0af88b7eaea295debd7e17720aa05323c8c487df (patch) | |
| tree | 0ea47815d0d8b0a032fb3b1984970cc51a946957 /crypto | |
| parent | d63ec4c24b02575838256ea35e13bf20df348995 (diff) | |
| download | FreeBSD-src-0af88b7eaea295debd7e17720aa05323c8c487df.zip FreeBSD-src-0af88b7eaea295debd7e17720aa05323c8c487df.tar.gz | |
Clean up hardcoded ar(1) flags in the tree to use the global ARFLAGS in
share/mk/sys.mk instead.
This is part of a medium term project to permit deterministic builds of
FreeBSD.
Submitted by: Erik Cederstrand <erik@cederstrand.dk>
Reviewed by: imp, toolchain@
Approved by: cperciva
MFC after: 2 weeks
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/heimdal/appl/ftp/common/Makefile.in | 2 | ||||
| -rw-r--r-- | crypto/heimdal/appl/telnet/libtelnet/Makefile.in | 2 | ||||
| -rw-r--r-- | crypto/openssl/Makefile.org | 4 | ||||
| -rw-r--r-- | crypto/openssl/crypto/Makefile | 3 |
4 files changed, 6 insertions, 5 deletions
diff --git a/crypto/heimdal/appl/ftp/common/Makefile.in b/crypto/heimdal/appl/ftp/common/Makefile.in index f3ec619..c225821 100644 --- a/crypto/heimdal/appl/ftp/common/Makefile.in +++ b/crypto/heimdal/appl/ftp/common/Makefile.in @@ -96,7 +96,7 @@ CONFIG_HEADER = $(top_builddir)/include/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) -ARFLAGS = cru +ARFLAGS ?= cru libcommon_a_AR = $(AR) $(ARFLAGS) libcommon_a_LIBADD = am_libcommon_a_OBJECTS = sockbuf.$(OBJEXT) buffer.$(OBJEXT) diff --git a/crypto/heimdal/appl/telnet/libtelnet/Makefile.in b/crypto/heimdal/appl/telnet/libtelnet/Makefile.in index 37a2296..33254f3 100644 --- a/crypto/heimdal/appl/telnet/libtelnet/Makefile.in +++ b/crypto/heimdal/appl/telnet/libtelnet/Makefile.in @@ -96,7 +96,7 @@ CONFIG_HEADER = $(top_builddir)/include/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) -ARFLAGS = cru +ARFLAGS ?= cru libtelnet_a_AR = $(AR) $(ARFLAGS) libtelnet_a_LIBADD = am_libtelnet_a_OBJECTS = auth.$(OBJEXT) enc_des.$(OBJEXT) \ diff --git a/crypto/openssl/Makefile.org b/crypto/openssl/Makefile.org index 55273ea..87153b8 100644 --- a/crypto/openssl/Makefile.org +++ b/crypto/openssl/Makefile.org @@ -63,8 +63,8 @@ DEPFLAG= PEX_LIBS= EX_LIBS= EXE_EXT= -ARFLAGS= -AR=ar $(ARFLAGS) r +ARFLAGS?= r +AR=ar $(ARFLAGS) RANLIB= ranlib NM= nm PERL= perl diff --git a/crypto/openssl/crypto/Makefile b/crypto/openssl/crypto/Makefile index 947dd5d..03b708b 100644 --- a/crypto/openssl/crypto/Makefile +++ b/crypto/openssl/crypto/Makefile @@ -13,7 +13,8 @@ MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) MAKEFILE= Makefile RM= rm -f -AR= ar r +ARFLAGS?= r +AR= ar ${ARFLAGS} RECURSIVE_MAKE= [ -n "$(SDIRS)" ] && for i in $(SDIRS) ; do \ (cd $$i && echo "making $$target in $(DIR)/$$i..." && \ |
