svn commit: r222090 - in head: . gnu/usr.bin share/mk
tools/build/options
Warner Losh
imp at FreeBSD.org
Thu May 19 07:39:27 UTC 2011
Author: imp
Date: Thu May 19 05:13:25 2011
New Revision: 222090
URL: http://svn.freebsd.org/changeset/base/222090
Log:
Implement WITH{,OUT}_{GCC,BINUTILS} to provide finer-grained control
over building gcc and binutils. They default to true, unless
MK_TOOLCHAIN is no.
Reviewed by: ru@
Added:
head/tools/build/options/WITHOUT_BINUTILS (contents, props changed)
head/tools/build/options/WITHOUT_GCC (contents, props changed)
Modified:
head/Makefile.inc1
head/gnu/usr.bin/Makefile
head/share/mk/bsd.own.mk
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1 Thu May 19 01:56:46 2011 (r222089)
+++ head/Makefile.inc1 Thu May 19 05:13:25 2011 (r222090)
@@ -1132,6 +1132,10 @@ _kgzip= usr.sbin/kgzip
.endif
.endif
+.if ${MK_BINUTILS} != "no"
+_binutils= gnu/usr.bin/binutils
+.endif
+
.if ${MK_CLANG} != "no"
.if ${CC:T:Mclang} == "clang"
_clang= usr.bin/clang
@@ -1139,12 +1143,16 @@ _clang_libs= lib/clang
.endif
.endif
+.if ${MK_GCC} != "no"
+_cc= gnu/usr.bin/cc
+.endif
+
cross-tools:
.for _tool in \
${_clang_libs} \
${_clang} \
- gnu/usr.bin/binutils \
- gnu/usr.bin/cc \
+ ${_binutils} \
+ ${_cc} \
usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint \
${_btxld} \
${_crunchide} \
Modified: head/gnu/usr.bin/Makefile
==============================================================================
--- head/gnu/usr.bin/Makefile Thu May 19 01:56:46 2011 (r222089)
+++ head/gnu/usr.bin/Makefile Thu May 19 05:13:25 2011 (r222090)
@@ -47,12 +47,14 @@ _texinfo= texinfo
_rcs= rcs
.endif
-.if ${MK_TOOLCHAIN} != "no"
+.if ${MK_BINUTILS} != "no"
_binutils= binutils
+.endif
+.if ${MK_GCC} != "no"
_cc= cc
+.endif
.if ${MK_GDB} != "no"
_gdb= gdb
.endif
-.endif
.include <bsd.subdir.mk>
Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk Thu May 19 01:56:46 2011 (r222089)
+++ head/share/mk/bsd.own.mk Thu May 19 05:13:25 2011 (r222090)
@@ -297,6 +297,7 @@ __DEFAULT_YES_OPTIONS = \
BIND_MTREE \
BIND_NAMED \
BIND_UTILS \
+ BINUTILS \
BLUETOOTH \
BOOT \
BSD_CPIO \
@@ -317,6 +318,7 @@ __DEFAULT_YES_OPTIONS = \
FP_LIBC \
FREEBSD_UPDATE \
GAMES \
+ GCC \
GCOV \
GDB \
GNU \
@@ -529,7 +531,9 @@ MK_GROFF:= no
.endif
.if ${MK_TOOLCHAIN} == "no"
+MK_BINUTILS:= no
MK_CLANG:= no
+MK_GCC:= no
MK_GDB:= no
.endif
Added: head/tools/build/options/WITHOUT_BINUTILS
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/build/options/WITHOUT_BINUTILS Thu May 19 05:13:25 2011 (r222090)
@@ -0,0 +1,7 @@
+.\" $FreeBSD$
+Set to not install binutils (as, c++-filt, gconv, gnu-ar, gnu-randlib,
+ld, nm, objcopy, objdump, readelf, size and strip)
+.Bf -symbolic
+The option does not generally work for build targets, unless some alternative
+toolchain is enabled.
+.Ef
Added: head/tools/build/options/WITHOUT_GCC
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/build/options/WITHOUT_GCC Thu May 19 05:13:25 2011 (r222090)
@@ -0,0 +1,6 @@
+.\" $FreeBSD$
+Set to not install gcc and g++.
+.Bf -symbolic
+The option does not generally work for build targets, unless some alternative
+toolchain is enabled.
+.Ef
More information about the svn-src-all
mailing list