svn commit: r235398 - in stable/9: gnu/usr.bin/binutils/ar gnu/usr.bin/binutils/as gnu/usr.bin/binutils/ld gnu/usr.bin/binutils/ranlib gnu/usr.bin/cc/cc gnu/usr.bin/cc/cc1 gnu/usr.bin/cc/cc1plus sh...

Konstantin Belousov kib at FreeBSD.org
Sun May 13 13:57:54 UTC 2012 

Author: kib
Date: Sun May 13 13:57:53 2012
New Revision: 235398
URL: http://svn.freebsd.org/changeset/base/235398

Log:
  MFC r234782:
  Add src.conf option WITH_SHARED_TOOLCHAIN to enable building the
  toolchain binaries as dynamically linked.  Option is disabled by
  default.
  
  MFC r235152 (by imp):
  Make is part of the bootstrap path, so we need to guard against this
  not being defined.  Otherwise we don't make a new make when the old
  make is incompatible.

Added:
  stable/9/tools/build/options/WITH_SHARED_TOOLCHAIN
     - copied unchanged from r234782, head/tools/build/options/WITH_SHARED_TOOLCHAIN
Modified:
  stable/9/gnu/usr.bin/binutils/ar/Makefile
  stable/9/gnu/usr.bin/binutils/as/Makefile
  stable/9/gnu/usr.bin/binutils/ld/Makefile
  stable/9/gnu/usr.bin/binutils/ranlib/Makefile
  stable/9/gnu/usr.bin/cc/cc/Makefile
  stable/9/gnu/usr.bin/cc/cc1/Makefile
  stable/9/gnu/usr.bin/cc/cc1plus/Makefile
  stable/9/share/mk/bsd.own.mk
  stable/9/usr.bin/ar/Makefile
  stable/9/usr.bin/make/Makefile
Directory Properties:
  stable/9/   (props changed)
  stable/9/gnu/usr.bin/binutils/   (props changed)
  stable/9/share/mk/   (props changed)
  stable/9/tools/   (props changed)
  stable/9/tools/build/options/   (props changed)
  stable/9/usr.bin/   (props changed)
  stable/9/usr.bin/ar/   (props changed)
  stable/9/usr.bin/make/   (props changed)

Modified: stable/9/gnu/usr.bin/binutils/ar/Makefile
==============================================================================
--- stable/9/gnu/usr.bin/binutils/ar/Makefile	Sun May 13 13:35:50 2012	(r235397)
+++ stable/9/gnu/usr.bin/binutils/ar/Makefile	Sun May 13 13:57:53 2012	(r235398)
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 .include "../Makefile.inc0"
+.include <bsd.own.mk>
 
 .PATH: ${SRCDIR}/binutils ${SRCDIR}/binutils/doc
 
@@ -16,7 +17,9 @@ CFLAGS+= -D_GNU_SOURCE
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+= -I${SRCDIR}/binutils
 CFLAGS+= -I${SRCDIR}/bfd
+.if ${MK_SHARED_TOOLCHAIN} == "no"
 NO_SHARED?= yes
+.endif
 DPADD=	${RELTOP}/libbinutils/libbinutils.a
 DPADD+=	${RELTOP}/libbfd/libbfd.a
 DPADD+=	${RELTOP}/libiberty/libiberty.a

Modified: stable/9/gnu/usr.bin/binutils/as/Makefile
==============================================================================
--- stable/9/gnu/usr.bin/binutils/as/Makefile	Sun May 13 13:35:50 2012	(r235397)
+++ stable/9/gnu/usr.bin/binutils/as/Makefile	Sun May 13 13:57:53 2012	(r235398)
@@ -4,6 +4,7 @@
 # BINDIR
 .include "${.CURDIR}/../../Makefile.inc"
 .include "${.CURDIR}/../Makefile.inc0"
+.include <bsd.own.mk>
 
 .PATH: ${SRCDIR}/gas ${SRCDIR}/gas/config
 
@@ -72,7 +73,9 @@ CFLAGS+= -D_GNU_SOURCE
 CFLAGS+= -I${SRCDIR}/gas -I${SRCDIR}/bfd -I${SRCDIR}/gas/config -I${SRCDIR}
 CFLAGS+= -I${.CURDIR} -I${.CURDIR}/${TARGET_CPUARCH}-freebsd
 
+.if ${MK_SHARED_TOOLCHAIN} == "no"
 NO_SHARED?=	yes
+.endif
 
 DPADD=	${RELTOP}/libbfd/libbfd.a
 DPADD+=	${RELTOP}/libiberty/libiberty.a

Modified: stable/9/gnu/usr.bin/binutils/ld/Makefile
==============================================================================
--- stable/9/gnu/usr.bin/binutils/ld/Makefile	Sun May 13 13:35:50 2012	(r235397)
+++ stable/9/gnu/usr.bin/binutils/ld/Makefile	Sun May 13 13:57:53 2012	(r235398)
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 .include "../Makefile.inc0"
+.include <bsd.own.mk>
 
 .PATH: ${SRCDIR}/ld
 
@@ -34,7 +35,9 @@ CFLAGS+= -DBINDIR=\"${BINDIR}\" -DTARGET
 CFLAGS+= -DTOOLBINDIR=\"${TOOLS_PREFIX}/${BINDIR}/libexec\"
 CFLAGS+= -D_GNU_SOURCE
 CFLAGS+= -I${SRCDIR}/ld -I${SRCDIR}/bfd
+.if ${MK_SHARED_TOOLCHAIN} == "no"
 NO_SHARED?= yes
+.endif
 DPADD=	${RELTOP}/libbfd/libbfd.a
 DPADD+=	${RELTOP}/libiberty/libiberty.a
 LDADD=	${DPADD}

Modified: stable/9/gnu/usr.bin/binutils/ranlib/Makefile
==============================================================================
--- stable/9/gnu/usr.bin/binutils/ranlib/Makefile	Sun May 13 13:35:50 2012	(r235397)
+++ stable/9/gnu/usr.bin/binutils/ranlib/Makefile	Sun May 13 13:57:53 2012	(r235398)
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 .include "../Makefile.inc0"
+.include <bsd.own.mk>
 
 .PATH: ${SRCDIR}/binutils ${SRCDIR}/binutils/doc
 
@@ -16,7 +17,9 @@ CFLAGS+= -D_GNU_SOURCE
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+= -I${SRCDIR}/binutils
 CFLAGS+= -I${SRCDIR}/bfd
+.if ${MK_SHARED_TOOLCHAIN} == "no"
 NO_SHARED?= yes
+.endif
 DPADD=	${RELTOP}/libbinutils/libbinutils.a
 DPADD+=	${RELTOP}/libbfd/libbfd.a
 DPADD+=	${RELTOP}/libiberty/libiberty.a

Modified: stable/9/gnu/usr.bin/cc/cc/Makefile
==============================================================================
--- stable/9/gnu/usr.bin/cc/cc/Makefile	Sun May 13 13:35:50 2012	(r235397)
+++ stable/9/gnu/usr.bin/cc/cc/Makefile	Sun May 13 13:57:53 2012	(r235398)
@@ -9,7 +9,9 @@ PROG=	gcc
 MAN=	gcc.1
 SRCS+=  gccspec.c
 
+.if ${MK_SHARED_TOOLCHAIN} == "no"
 NO_SHARED?=yes
+.endif
 
 MLINKS=	gcc.1 g++.1
 .if ${MK_CLANG_IS_CC} == "no"

Modified: stable/9/gnu/usr.bin/cc/cc1/Makefile
==============================================================================
--- stable/9/gnu/usr.bin/cc/cc1/Makefile	Sun May 13 13:35:50 2012	(r235397)
+++ stable/9/gnu/usr.bin/cc/cc1/Makefile	Sun May 13 13:57:53 2012	(r235398)
@@ -1,14 +1,17 @@
 # $FreeBSD$
 
 .include "../Makefile.inc"
+NO_MAN=
+.include <bsd.own.mk>
 
 .PATH: ${GCCDIR}
 
 PROG=	cc1
 SRCS=	main.c c-parser.c c-lang.c
 BINDIR=	/usr/libexec
-NO_MAN=
+.if ${MK_SHARED_TOOLCHAIN} == "no"
 NO_SHARED?=yes
+.endif
 
 OBJS+=  ${PROG}-checksum.o
 DPADD=	${LIBBACKEND} ${LIBCPP} ${LIBDECNUMBER} ${LIBIBERTY}

Modified: stable/9/gnu/usr.bin/cc/cc1plus/Makefile
==============================================================================
--- stable/9/gnu/usr.bin/cc/cc1plus/Makefile	Sun May 13 13:35:50 2012	(r235397)
+++ stable/9/gnu/usr.bin/cc/cc1plus/Makefile	Sun May 13 13:57:53 2012	(r235398)
@@ -1,6 +1,8 @@
 # $FreeBSD$
 
 .include "../Makefile.inc"
+NO_MAN=
+.include <bsd.own.mk>
 
 .PATH: ${GCCDIR}/cp ${GCCDIR}
 
@@ -13,8 +15,9 @@ SRCS+=	main.c cp-lang.c c-opts.c call.c 
 	cp-objcp-common.c cp-gimplify.c tree-mudflap.c
 
 BINDIR=	/usr/libexec
-NO_MAN=
+.if ${MK_SHARED_TOOLCHAIN} == "no"
 NO_SHARED?=yes
+.endif
 
 CFLAGS+= -I${GCCDIR}/cp -I.
 

Modified: stable/9/share/mk/bsd.own.mk
==============================================================================
--- stable/9/share/mk/bsd.own.mk	Sun May 13 13:35:50 2012	(r235397)
+++ stable/9/share/mk/bsd.own.mk	Sun May 13 13:57:53 2012	(r235398)
@@ -418,7 +418,8 @@ __DEFAULT_NO_OPTIONS = \
     HESIOD \
     ICONV \
     IDEA \
-    OFED
+    OFED \
+    SHARED_TOOLCHAIN
 
 #
 # Default behaviour of some options depends on the architecture.  Unfortunately

Copied: stable/9/tools/build/options/WITH_SHARED_TOOLCHAIN (from r234782, head/tools/build/options/WITH_SHARED_TOOLCHAIN)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/9/tools/build/options/WITH_SHARED_TOOLCHAIN	Sun May 13 13:57:53 2012	(r235398, copy of r234782, head/tools/build/options/WITH_SHARED_TOOLCHAIN)
@@ -0,0 +1,6 @@
+.\" $FreeBSD$
+Set to build the toolchain binaries shared.
+The set includes
+.Xr cc 1 ,
+.Xr make 1
+and neccessary utilites like assembler, linker and library archive manager.

Modified: stable/9/usr.bin/ar/Makefile
==============================================================================
--- stable/9/usr.bin/ar/Makefile	Sun May 13 13:35:50 2012	(r235397)
+++ stable/9/usr.bin/ar/Makefile	Sun May 13 13:57:53 2012	(r235398)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	ar
 SRCS=	ar.c acplex.l acpyacc.y read.c util.c write.c y.tab.h
 
@@ -8,7 +10,9 @@ LDADD=	-larchive -lelf
 
 CFLAGS+=-I. -I${.CURDIR}
 
+.if ${MK_SHARED_TOOLCHAIN} == "no"
 NO_SHARED?=	yes
+.endif
 LINKS=	${BINDIR}/ar ${BINDIR}/ranlib
 MLINKS= ar.1 ranlib.1
 

Modified: stable/9/usr.bin/make/Makefile
==============================================================================
--- stable/9/usr.bin/make/Makefile	Sun May 13 13:35:50 2012	(r235397)
+++ stable/9/usr.bin/make/Makefile	Sun May 13 13:57:53 2012	(r235398)
@@ -2,13 +2,17 @@
 #	$Id: Makefile,v 1.6 1994/06/30 05:33:39 cgd Exp $
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	make
 CFLAGS+=-I${.CURDIR}
 SRCS=	arch.c buf.c cond.c dir.c for.c hash.c hash_tables.c job.c	\
 	lst.c main.c make.c parse.c proc.c shell.c str.c suff.c targ.c	\
 	util.c var.c
 
+.if !defined(MK_SHARED_TOOLCHAIN) || ${MK_SHARED_TOOLCHAIN} == "no"
 NO_SHARED?=	YES
+.endif
 
 CFLAGS+=-DMAKE_VERSION=\"5200408120\"
 # There is no obvious performance improvement currently.

More information about the svn-src-stable-9 mailing list