Author: imp
Date: Fri Apr 25 19:25:45 2014
New Revision: 264930
URL: http://svnweb.freebsd.org/changeset/base/264930
Log:
Eliminate NO_INCS. It is used one place, and MK_TOOLCHAIN=no will
handle the job just as well. Opt for simplicity rather than one more
option.
Modified:
head/Makefile.inc1
head/share/mk/bsd.incs.mk
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1 Fri Apr 25 19:25:37 2014 (r264929)
+++ head/Makefile.inc1 Fri Apr 25 19:25:45 2014 (r264930)
@@ -406,8 +406,8 @@ LIB32WMAKEFLAGS+= CC="${XCC} ${LIB32FLAG
LIB32WMAKE= ${LIB32WMAKEENV} ${MAKE} ${LIB32WMAKEFLAGS} \
MK_MAN=no MK_INFO=no MK_HTML=no
-LIB32IMAKE= ${LIB32WMAKE:NINSTALL=*:NDESTDIR=*:N_LDSCRIPTROOT=*} -DNO_INCS \
- ${IMAKE_INSTALL}
+LIB32IMAKE= ${LIB32WMAKE:NINSTALL=*:NDESTDIR=*:N_LDSCRIPTROOT=*} \
+ MK_TOOLCHAIN=no ${IMAKE_INSTALL}
.endif
IMAKEENV= ${CROSSENV:N_LDSCRIPTROOT=*}
Modified: head/share/mk/bsd.incs.mk
==============================================================================
--- head/share/mk/bsd.incs.mk Fri Apr 25 19:25:37 2014 (r264929)
+++ head/share/mk/bsd.incs.mk Fri Apr 25 19:25:45 2014 (r264930)
@@ -4,7 +4,7 @@
.error bsd.incs.mk cannot be included directly.
.endif
-.if !defined(NO_INCS) && ${MK_TOOLCHAIN} != "no"
+.if ${MK_TOOLCHAIN} != "no"
INCSGROUPS?= INCS
@@ -81,4 +81,4 @@ installincludes:
realinstall: installincludes
.ORDER: beforeinstall installincludes
-.endif # !defined(NO_INCS) && ${MK_TOOLCHAIN} != "no"
+.endif # ${MK_TOOLCHAIN} != "no"
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
