Reimplementation of world/kernel build options. For details, see:

http://lists.freebsd.org/pipermail/freebsd-current/2006-March/061725.html

The src.conf(5) manpage is to follow in a few days.

Brought to you by:	imp, jhb, kris, phk, ru (all bugs are mine)

2 files changed, 14 insertions, 10 deletions

diff --git a/gnu/usr.bin/cc/Makefile b/gnu/usr.bin/cc/Makefile
index d8ea8c2..b1aa973 100644
--- a/gnu/usr.bin/cc/Makefile
+++ b/gnu/usr.bin/cc/Makefile
@@ -1,30 +1,32 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 # The order of some of these are rather important.  Some depend on previous
 # subdirs.
 
 SUBDIR= cc_tools cc_int cc cc1 include protoize doc
 
-.if !defined(NO_CPP)
+.if ${MK_CPP} != "no"
 SUBDIR+= cpp
 .endif
 
-.if !defined(NO_CXX)
+.if ${MK_CXX} != "no"
 SUBDIR+= cc1plus c++ c++filt
-.if !defined(NO_COLLECT2)
+.if ${MK_COLLECT2} != "no"
 #SUBDIR+= collect2
 .endif
 .endif
 
-.if !defined(NO_OBJC)
+.if ${MK_OBJC} != "no"
 SUBDIR+= cc1obj
 .endif
 
-.if !defined(NO_FORTRAN)
+.if ${MK_FORTRAN} != "no"
 SUBDIR+= f77 f771 f77doc
 .endif
 
-.if !defined(NO_GCOV)
+.if ${MK_GCOV} != "no"
 SUBDIR+= gcov
 .endif
 
diff --git a/gnu/usr.bin/cc/cc_tools/Makefile b/gnu/usr.bin/cc/cc_tools/Makefile
index 78bdb69..31da5fb 100644
--- a/gnu/usr.bin/cc/cc_tools/Makefile
+++ b/gnu/usr.bin/cc/cc_tools/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 #
 # This could probably be merged with ../cc_int/Makefile, but bsd.lib.mk
 # is such a !@#!*#% nightmare because of how it reprograms the dependencies,
@@ -197,7 +199,7 @@ CLEANFILES+=	gt-*.h gtype-*.h
 #-----------------------------------------------------------------------
 # Fortran build tools
 
-.if !defined(NO_FORTRAN)
+.if ${MK_FORTRAN} != "no"
 gen-time-stamp: fini
 fini: fini.o ${LIBIBERTY}
 	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
@@ -295,15 +297,15 @@ GTFILES = $(srcdir)/input.h $(srcdir)/coretypes.h $(srcdir)/cpplib.h \
 #
 GTFILES_LANG_DIR_NAMES=
 
-.if !defined(NO_CXX)
+.if ${MK_CXX} != "no"
 GTFILES_LANG_DIR_NAMES+=	cp
 .endif
 
-.if !defined(NO_OBJC)
+.if ${MK_OBJC} != "no"
 GTFILES_LANG_DIR_NAMES+=	objc
 .endif
 
-.if !defined(NO_FORTRAN)
+.if ${MK_FORTRAN} != "no"
 GTFILES_LANG_DIR_NAMES+=	f
 .endif