Date: Wed, 30 May 2012 22:31:45 +0000 (UTC) From: "David E. O'Brien" <obrien@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r236342 - in stable/8: . gnu/usr.bin share/mk tools/build/options Message-ID: <201205302231.q4UMVjuv084641@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: obrien Date: Wed May 30 22:31:45 2012 New Revision: 236342 URL: http://svn.freebsd.org/changeset/base/236342 Log: MFC: r222090: add WITH{,OUT}_{GCC,BINUTILS} providing fine-grained control Added: stable/8/tools/build/options/WITHOUT_BINUTILS - copied unchanged from r222090, head/tools/build/options/WITHOUT_BINUTILS stable/8/tools/build/options/WITHOUT_GCC - copied unchanged from r222090, head/tools/build/options/WITHOUT_GCC Modified: stable/8/Makefile.inc1 stable/8/gnu/usr.bin/Makefile (contents, props changed) stable/8/share/mk/bsd.own.mk Directory Properties: stable/8/ (props changed) stable/8/gnu/ (props changed) stable/8/gnu/usr.bin/ (props changed) stable/8/tools/ (props changed) stable/8/tools/build/options/ (props changed) Modified: stable/8/Makefile.inc1 ============================================================================== --- stable/8/Makefile.inc1 Wed May 30 22:28:08 2012 (r236341) +++ stable/8/Makefile.inc1 Wed May 30 22:31:45 2012 (r236342) @@ -1046,10 +1046,18 @@ _kgzip= usr.sbin/kgzip .endif .endif +.if ${MK_BINUTILS} != "no" +_binutils= gnu/usr.bin/binutils +.endif + +.if ${MK_GCC} != "no" +_cc= gnu/usr.bin/cc +.endif + cross-tools: .for _tool in \ - gnu/usr.bin/binutils \ - gnu/usr.bin/cc \ + ${_binutils} \ + ${_cc} \ usr.bin/sed \ usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint \ ${_btxld} \ Modified: stable/8/gnu/usr.bin/Makefile ============================================================================== --- stable/8/gnu/usr.bin/Makefile Wed May 30 22:28:08 2012 (r236341) +++ stable/8/gnu/usr.bin/Makefile Wed May 30 22:31:45 2012 (r236342) @@ -53,12 +53,14 @@ _man= man _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: stable/8/share/mk/bsd.own.mk ============================================================================== --- stable/8/share/mk/bsd.own.mk Wed May 30 22:28:08 2012 (r236341) +++ stable/8/share/mk/bsd.own.mk Wed May 30 22:31:45 2012 (r236342) @@ -315,6 +315,7 @@ WITH_IDEA= BIND_MTREE \ BIND_NAMED \ BIND_UTILS \ + BINUTILS \ BLUETOOTH \ BOOT \ BSD_CPIO \ @@ -335,6 +336,7 @@ WITH_IDEA= FP_LIBC \ FREEBSD_UPDATE \ GAMES \ + GCC \ GCOV \ GDB \ GNU \ @@ -504,6 +506,8 @@ MK_GROFF:= no .endif .if ${MK_TOOLCHAIN} == "no" +MK_BINUTILS:= no +MK_GCC:= no MK_GDB:= no .endif Copied: stable/8/tools/build/options/WITHOUT_BINUTILS (from r222090, head/tools/build/options/WITHOUT_BINUTILS) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/8/tools/build/options/WITHOUT_BINUTILS Wed May 30 22:31:45 2012 (r236342, copy of r222090, head/tools/build/options/WITHOUT_BINUTILS) @@ -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 Copied: stable/8/tools/build/options/WITHOUT_GCC (from r222090, head/tools/build/options/WITHOUT_GCC) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/8/tools/build/options/WITHOUT_GCC Wed May 30 22:31:45 2012 (r236342, copy of r222090, head/tools/build/options/WITHOUT_GCC) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201205302231.q4UMVjuv084641>