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 /contrib/gcclibs | |
| 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 'contrib/gcclibs')
| -rw-r--r-- | contrib/gcclibs/libcpp/Makefile.in | 4 | ||||
| -rw-r--r-- | contrib/gcclibs/libdecnumber/Makefile.in | 4 | ||||
| -rw-r--r-- | contrib/gcclibs/libiberty/Makefile.in | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/contrib/gcclibs/libcpp/Makefile.in b/contrib/gcclibs/libcpp/Makefile.in index f565fa2..7a0b74f 100644 --- a/contrib/gcclibs/libcpp/Makefile.in +++ b/contrib/gcclibs/libcpp/Makefile.in @@ -26,8 +26,8 @@ srcdir = @srcdir@ top_builddir = . VPATH = @srcdir@ INSTALL = @INSTALL@ -AR = ar -ARFLAGS = cru +AR = @AR@ +ARFLAGS = @ARFLAGS@ ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ diff --git a/contrib/gcclibs/libdecnumber/Makefile.in b/contrib/gcclibs/libdecnumber/Makefile.in index c020e0b..eb314b4 100644 --- a/contrib/gcclibs/libdecnumber/Makefile.in +++ b/contrib/gcclibs/libdecnumber/Makefile.in @@ -26,8 +26,8 @@ srcdir = @srcdir@ top_builddir = . VPATH = @srcdir@ INSTALL = @INSTALL@ -AR = ar -ARFLAGS = cru +AR = @AR@ +ARFLAGS = @ARFLAGS@ ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ diff --git a/contrib/gcclibs/libiberty/Makefile.in b/contrib/gcclibs/libiberty/Makefile.in index 570d2e8..2370a83 100644 --- a/contrib/gcclibs/libiberty/Makefile.in +++ b/contrib/gcclibs/libiberty/Makefile.in @@ -56,7 +56,7 @@ mkinstalldirs = $(SHELL) $(libiberty_topdir)/mkinstalldirs OUTPUT_OPTION = @OUTPUT_OPTION@ AR = @AR@ -AR_FLAGS = rc +ARFLAGS = @ARFLAGS@ CC = @CC@ CFLAGS = @CFLAGS@ @@ -81,7 +81,7 @@ EXTRA_OFILES = # Flags to pass to a recursive make. FLAGS_TO_PASS = \ "AR=$(AR)" \ - "AR_FLAGS=$(AR_FLAGS)" \ + "AR_FLAGS=$(ARFLAGS)" \ "CC=$(CC)" \ "CFLAGS=$(CFLAGS)" \ "DESTDIR=$(DESTDIR)" \ @@ -224,12 +224,12 @@ INSTALLED_HEADERS = \ $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS) -rm -f $(TARGETLIB) pic/$(TARGETLIB) - $(AR) $(AR_FLAGS) $(TARGETLIB) \ + $(AR) $(ARFLAGS) $(TARGETLIB) \ $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS) $(RANLIB) $(TARGETLIB) if [ x"$(PICFLAG)" != x ]; then \ cd pic; \ - $(AR) $(AR_FLAGS) $(TARGETLIB) \ + $(AR) $(ARFLAGS) $(TARGETLIB) \ $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \ $(RANLIB) $(TARGETLIB); \ cd ..; \ @@ -237,7 +237,7 @@ $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS) $(TESTLIB): $(REQUIRED_OFILES) $(CONFIGURED_OFILES) -rm -f $(TESTLIB) - $(AR) $(AR_FLAGS) $(TESTLIB) \ + $(AR) $(ARFLAGS) $(TESTLIB) \ $(REQUIRED_OFILES) $(CONFIGURED_OFILES) $(RANLIB) $(TESTLIB) |
