diff options
author | Alex Richardson <Alexander.Richardson@cl.cam.ac.uk> | 2021-01-06 17:55:06 +0000 |
---|---|---|
committer | Alex Richardson <arichardson@FreeBSD.org> | 2021-01-07 09:31:03 +0000 |
commit | 7fa2f2a62f04f095e1e27ad55aa22a8f59b1df8f (patch) | |
tree | cd926f5786b67b905e2c475f1b422b7e4ba261e6 /Makefile.inc1 | |
parent | 94ffff68c8e84d4983e3d803575cfdb3e5782515 (diff) | |
download | src-7fa2f2a62f04f095e1e27ad55aa22a8f59b1df8f.tar.gz src-7fa2f2a62f04f095e1e27ad55aa22a8f59b1df8f.zip |
Rename NO_WERROR -> MK_WERROR=no
As suggested in D27598. This also supports MK_WERROR.clang=no and
MK_WERROR.gcc=no to support the existing NO_WERROR.<compiler> uses.
Reviewed By: brooks
Differential Revision: https://reviews.freebsd.org/D27601
Diffstat (limited to 'Makefile.inc1')
-rw-r--r-- | Makefile.inc1 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 4bb8ef282f4a..c4e656c79ceb 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -731,7 +731,7 @@ BSARGS= DESTDIR= \ SSP_CFLAGS= \ MK_HTML=no NO_LINT=yes MK_MAN=no MK_MAN_UTILS=yes \ -DNO_PIC MK_PROFILE=no -DNO_SHARED \ - -DNO_CPU_CFLAGS -DNO_WERROR MK_CTF=no \ + -DNO_CPU_CFLAGS MK_WERROR=no MK_CTF=no \ MK_CLANG_EXTRAS=no MK_CLANG_FORMAT=no MK_CLANG_FULL=no \ MK_LLDB=no MK_RETPOLINE=no MK_TESTS=no \ MK_INCLUDES=yes @@ -752,7 +752,7 @@ TMAKE= \ BWPHASE=${.TARGET:C,^_,,} \ SSP_CFLAGS= \ -DNO_LINT \ - -DNO_CPU_CFLAGS -DNO_WERROR MK_CTF=no \ + -DNO_CPU_CFLAGS MK_WERROR=no MK_CTF=no \ MK_CLANG_EXTRAS=no MK_CLANG_FORMAT=no MK_CLANG_FULL=no \ MK_LLDB=no MK_RETPOLINE=no MK_TESTS=no @@ -780,7 +780,7 @@ KTMAKE= \ SSP_CFLAGS= \ MK_HTML=no -DNO_LINT MK_MAN=no \ -DNO_PIC MK_PROFILE=no -DNO_SHARED \ - -DNO_CPU_CFLAGS MK_RETPOLINE=no -DNO_WERROR MK_CTF=no + -DNO_CPU_CFLAGS MK_RETPOLINE=no MK_WERROR=no MK_CTF=no # world stage WMAKEENV= ${CROSSENV} \ @@ -2748,7 +2748,7 @@ NXBMAKEARGS+= \ MK_SENDMAIL=no \ MK_SVNLITE=no \ MK_TESTS=no \ - -DNO_WERROR \ + MK_WERROR=no \ MK_ZFS=no .if make(native-xtools*) && \ @@ -3367,7 +3367,7 @@ XDEV_CPUTYPE?=${TARGET_CPUTYPE} NOFUN=-DNO_FSCHG MK_HTML=no -DNO_LINT \ MK_MAN=no MK_NLS=no MK_PROFILE=no \ - MK_KERBEROS=no MK_RESCUE=no MK_TESTS=no -DNO_WERROR \ + MK_KERBEROS=no MK_RESCUE=no MK_TESTS=no MK_WERROR=no \ TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ CPUTYPE=${XDEV_CPUTYPE} |