diff options
| author | imp <imp@FreeBSD.org> | 2014-04-25 19:25:45 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2014-04-25 19:25:45 +0000 |
| commit | edf11b5e7e24a35da1c25414ece981ad4a0eef47 (patch) | |
| tree | 6832bc5777c8f04822a7608a1ccd3d0679943030 | |
| parent | f9de3ca24138adee0a9dfa4fa61e9bce2d720e27 (diff) | |
| download | FreeBSD-src-edf11b5e7e24a35da1c25414ece981ad4a0eef47.zip FreeBSD-src-edf11b5e7e24a35da1c25414ece981ad4a0eef47.tar.gz | |
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.
| -rw-r--r-- | Makefile.inc1 | 4 | ||||
| -rw-r--r-- | share/mk/bsd.incs.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index affd36f..d4fb4e9 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -406,8 +406,8 @@ LIB32WMAKEFLAGS+= CC="${XCC} ${LIB32FLAGS}" \ 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=*} diff --git a/share/mk/bsd.incs.mk b/share/mk/bsd.incs.mk index 74c378b..5147437 100644 --- a/share/mk/bsd.incs.mk +++ b/share/mk/bsd.incs.mk @@ -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" |
