diff options
author | imp <imp@FreeBSD.org> | 2014-05-10 16:37:53 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2014-05-10 16:37:53 +0000 |
commit | 83f75350837bec3abb754f10990fc31754daf37f (patch) | |
tree | 2b86218eed1201cddd0d3d94c82acbefd6bc4ebd /share | |
parent | 51d6262e2845def773b18189819dca32353ac541 (diff) | |
download | FreeBSD-src-83f75350837bec3abb754f10990fc31754daf37f.zip FreeBSD-src-83f75350837bec3abb754f10990fc31754daf37f.tar.gz |
Migrate NO_WARN to MK_WARN. Support legacy NO_WARN usage. Remove a
check for EARLY_BUILD because it isn't necessary (MK_WARN=no will
always be defined for that).
Diffstat (limited to 'share')
-rw-r--r-- | share/mk/bsd.opts.mk | 6 | ||||
-rw-r--r-- | share/mk/bsd.sys.mk | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/share/mk/bsd.opts.mk b/share/mk/bsd.opts.mk index 805200b..885d922 100644 --- a/share/mk/bsd.opts.mk +++ b/share/mk/bsd.opts.mk @@ -56,7 +56,8 @@ __DEFAULT_YES_OPTIONS = \ PROFILE \ SSP \ SYMVER \ - TOOLCHAIN + TOOLCHAIN \ + WARNS __DEFAULT_NO_OPTIONS = \ CTF \ @@ -76,7 +77,8 @@ __DEFAULT_NO_OPTIONS = \ DEBUG_FILES \ INSTALLLIB \ MAN \ - PROFILE + PROFILE \ + WARNS .if defined(NO_${var}) # This warning may be premature... #.warning "NO_${var} is defined, but deprecated. Please use MK_${var}=no instead." diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index 7150f2f..3bcd237 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -4,7 +4,7 @@ # sources. # Enable various levels of compiler warning checks. These may be -# overridden (e.g. if using a non-gcc compiler) by defining NO_WARNS. +# overridden (e.g. if using a non-gcc compiler) by defining MK_WARNS=no. # for GCC: http://gcc.gnu.org/onlinedocs/gcc-4.2.1/gcc/Warning-Options.html @@ -134,9 +134,8 @@ CFLAGS+= ${SSP_CFLAGS} .endif # SSP && !IA64 && !ARM && !MIPS # Allow user-specified additional warning flags, plus compiler specific flag overrides. -# Unless we're early in the build, in which case don't (which is lame, this should -# be handled by NO_WARNS which needs to migrate to something else. -.if !defined(NO_WARNS) && !defined(EARLY_BUILD) +# Unless we've overriden this... +.if ${MK_WARNS} != "no" CFLAGS+= ${CWARNFLAGS} ${CWARNFLAGS.${COMPILER_TYPE}} .endif |