d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stop passing MK_WARNS=no for bootstrap tools

Browse Source 
I got annoyed by the number of warnings that the CheriBSD build was
emitting. It turns out that we are emitting lots of warnings during
bootstrap because bootstrap tools are built with the default compiler
flags and ignore the warnings flags that are set in bsd.sys.mk.

Looking at git blame, it appears that MK_WARNS=no has been passed since
rS112869, replacing the -DNO_WERROR option that was added in rS87775.

This commit changes MK_WARNS=no back to -DNO_WERROR. We need to pass
-DNO_WERROR, since the system compiler might have new warnings that we
don't know about yet, and we shouldn't fail the build in that case.

Reviewed By:	imp, brooks
Differential Revision: https://reviews.freebsd.org/D27598
This commit is contained in:
Alex Richardson 2021-01-06 17:52:02 +00:00 committed by Alex Richardson
parent 7467c537a5
commit 94ffff68c8
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile.inc1
View File

@ -731,7 +731,7 @@ BSARGS= DESTDIR= \
SSP_CFLAGS= \ SSP_CFLAGS= \
MK_HTML=no NO_LINT=yes MK_MAN=no MK_MAN_UTILS=yes \ MK_HTML=no NO_LINT=yes MK_MAN=no MK_MAN_UTILS=yes \
-DNO_PIC MK_PROFILE=no -DNO_SHARED \ -DNO_PIC MK_PROFILE=no -DNO_SHARED \
-DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \ -DNO_CPU_CFLAGS -DNO_WERROR MK_CTF=no \
MK_CLANG_EXTRAS=no MK_CLANG_FORMAT=no MK_CLANG_FULL=no \ MK_CLANG_EXTRAS=no MK_CLANG_FORMAT=no MK_CLANG_FULL=no \
MK_LLDB=no MK_RETPOLINE=no MK_TESTS=no \ MK_LLDB=no MK_RETPOLINE=no MK_TESTS=no \
MK_INCLUDES=yes MK_INCLUDES=yes
@ -752,7 +752,7 @@ TMAKE= \
BWPHASE=${.TARGET:C,^_,,} \ BWPHASE=${.TARGET:C,^_,,} \
SSP_CFLAGS= \ SSP_CFLAGS= \
-DNO_LINT \ -DNO_LINT \
-DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \ -DNO_CPU_CFLAGS -DNO_WERROR MK_CTF=no \
MK_CLANG_EXTRAS=no MK_CLANG_FORMAT=no MK_CLANG_FULL=no \ MK_CLANG_EXTRAS=no MK_CLANG_FORMAT=no MK_CLANG_FULL=no \
MK_LLDB=no MK_RETPOLINE=no MK_TESTS=no MK_LLDB=no MK_RETPOLINE=no MK_TESTS=no
@ -780,7 +780,7 @@ KTMAKE= \
SSP_CFLAGS= \ SSP_CFLAGS= \
MK_HTML=no -DNO_LINT MK_MAN=no \ MK_HTML=no -DNO_LINT MK_MAN=no \
-DNO_PIC MK_PROFILE=no -DNO_SHARED \ -DNO_PIC MK_PROFILE=no -DNO_SHARED \
-DNO_CPU_CFLAGS MK_RETPOLINE=no MK_WARNS=no MK_CTF=no -DNO_CPU_CFLAGS MK_RETPOLINE=no -DNO_WERROR MK_CTF=no
# world stage # world stage
WMAKEENV= ${CROSSENV} \ WMAKEENV= ${CROSSENV} \
@ -2748,7 +2748,7 @@ NXBMAKEARGS+= \
MK_SENDMAIL=no \ MK_SENDMAIL=no \
MK_SVNLITE=no \ MK_SVNLITE=no \
MK_TESTS=no \ MK_TESTS=no \
MK_WARNS=no \ -DNO_WERROR \
MK_ZFS=no MK_ZFS=no
.if make(native-xtools*) && \ .if make(native-xtools*) && \
@ -3367,7 +3367,7 @@ XDEV_CPUTYPE?=${TARGET_CPUTYPE}
NOFUN=-DNO_FSCHG MK_HTML=no -DNO_LINT \ NOFUN=-DNO_FSCHG MK_HTML=no -DNO_LINT \
MK_MAN=no MK_NLS=no MK_PROFILE=no \ MK_MAN=no MK_NLS=no MK_PROFILE=no \
MK_KERBEROS=no MK_RESCUE=no MK_TESTS=no MK_WARNS=no \ MK_KERBEROS=no MK_RESCUE=no MK_TESTS=no -DNO_WERROR \
TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
CPUTYPE=${XDEV_CPUTYPE} CPUTYPE=${XDEV_CPUTYPE}

2
Makefile.libcompat
View File

@ -104,7 +104,7 @@ build${libcompat}: .PHONY
OBJROOT='$${OBJTOP}/' \ OBJROOT='$${OBJTOP}/' \
MAKEOBJDIRPREFIX= \ MAKEOBJDIRPREFIX= \
DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS \ DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS \
MK_CTF=no MK_RETPOLINE=no MK_WARNS=no \ MK_CTF=no MK_RETPOLINE=no -DNO_WERROR \
${_t} ${_t}
.endfor .endfor
.endfor .endfor

2
targets/pseudo/bootstrap-tools/Makefile
View File

@ -42,7 +42,7 @@ BSARGS= DESTDIR= \
SSP_CFLAGS= \ SSP_CFLAGS= \
MK_HTML=no NO_LINT=yes MK_MAN=no \ MK_HTML=no NO_LINT=yes MK_MAN=no \
-DNO_PIC MK_PROFILE=no -DNO_SHARED \ -DNO_PIC MK_PROFILE=no -DNO_SHARED \
-DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \ -DNO_CPU_CFLAGS -DNO_WERROR MK_CTF=no \
MK_CLANG_EXTRAS=no MK_CLANG_FORMAT=no MK_CLANG_FULL=no \ MK_CLANG_EXTRAS=no MK_CLANG_FORMAT=no MK_CLANG_FULL=no \
MK_LLDB=no MK_TESTS=no \ MK_LLDB=no MK_TESTS=no \
MK_INCLUDES=yes MK_INCLUDES=yes