upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-02-18 18:20:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

mk: format some option lists

Browse source 
Alphabetize and give each option its own line, ahead of making another
change to these lists. This makes future diffs easier to read.

Reviewed by:	imp, emaste
MFC after:	1 week
Differential Revision:	https://reviews.freebsd.org/D31399
This commit is contained in:
Mitchell Horne 2021-08-04 15:17:34 -03:00
parent 8399d923a5
commit bcd2f41f7d
3 changed files with 65 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
Makefile.inc1
View file

@ -715,13 +715,25 @@ BSARGS= DESTDIR= \
BOOTSTRAPPING=${BOOTSTRAPPING_OSRELDATE} \
BWPHASE=${.TARGET:C,^_,,} \
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 MK_WERROR=no MK_CTF=no \
MK_ASAN=no MK_UBSAN=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
-DNO_CPU_CFLAGS \
-DNO_LINT \
-DNO_PIC \
-DNO_SHARED \
MK_ASAN=no \
MK_CTF=no \
MK_CLANG_EXTRAS=no \
MK_CLANG_FORMAT=no \
MK_CLANG_FULL=no \
MK_HTML=no \
MK_LLDB=no \
MK_MAN=no \
MK_PROFILE=no \
MK_RETPOLINE=no \
MK_TESTS=no \
MK_UBSAN=no \
MK_WERROR=no \
MK_INCLUDES=yes \
MK_MAN_UTILS=yes
BMAKE= \
${TIME_ENV} ${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
@ -738,11 +750,18 @@ TMAKE= \
BOOTSTRAPPING=${BOOTSTRAPPING_OSRELDATE} \
BWPHASE=${.TARGET:C,^_,,} \
SSP_CFLAGS= \
-DNO_CPU_CFLAGS \
-DNO_LINT \
-DNO_CPU_CFLAGS MK_WERROR=no MK_CTF=no \
MK_ASAN=no MK_UBSAN=no \
MK_CLANG_EXTRAS=no MK_CLANG_FORMAT=no MK_CLANG_FULL=no \
MK_LLDB=no MK_RETPOLINE=no MK_TESTS=no
MK_ASAN=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_UBSAN=no \
MK_WERROR=no
# cross-tools stage
# TOOLS_PREFIX set in BMAKE
@ -766,9 +785,16 @@ KTMAKE= ${TIME_ENV} \
MAKEOBJDIRPREFIX= \
BOOTSTRAPPING=${BOOTSTRAPPING_OSRELDATE} \
SSP_CFLAGS= \
MK_HTML=no -DNO_LINT MK_MAN=no \
-DNO_PIC MK_PROFILE=no -DNO_SHARED \
-DNO_CPU_CFLAGS MK_RETPOLINE=no MK_WERROR=no MK_CTF=no
-DNO_CPU_CFLAGS \
-DNO_LINT \
-DNO_PIC \
-DNO_SHARED \
MK_CTF=no \
MK_HTML=no \
MK_MAN=no \
MK_PROFILE=no \
MK_RETPOLINE=no \
MK_WERROR=no
# world stage
WMAKEENV= ${CROSSENV} \

11
Makefile.libcompat
View file

@ -103,9 +103,14 @@ build${libcompat}: .PHONY
OBJTOP=${LIBCOMPAT_OBJTOP} \
OBJROOT='$${OBJTOP}/' \
MAKEOBJDIRPREFIX= \
DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS \
MK_ASAN=no MK_UBSAN=no \
MK_CTF=no MK_RETPOLINE=no MK_WERROR=no \
DIRPRFX=${_dir}/ \
-DNO_LINT \
-DNO_CPU_CFLAGS \
MK_ASAN=no \
MK_CTF=no \
MK_RETPOLINE=no \
MK_UBSAN=no \
MK_WERROR=no \
${_t}
.endfor
.endfor

23
targets/pseudo/bootstrap-tools/Makefile
View file

@ -40,12 +40,23 @@ BSARGS= DESTDIR= \
BOOTSTRAPPING=${OSRELDATE} \
BWPHASE=${.TARGET} \
SSP_CFLAGS= \
MK_HTML=no NO_LINT=yes MK_MAN=no \
-DNO_PIC MK_PROFILE=no -DNO_SHARED \
-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_TESTS=no \
MK_INCLUDES=yes
-DNO_CPU_CFLAGS \
-DNO_LINT \
-DNO_PIC \
-DNO_SHARED \
MK_CTF=no \
MK_CLANG_EXTRAS=no \
MK_CLANG_FORMAT=no \
MK_CLANG_FULL=no \
MK_HTML=no \
MK_LLDB=no \
MK_MAN=no \
MK_PROFILE=no \
MK_RETPOLINE=no \
MK_TESTS=no \
MK_WERROR=no \
MK_INCLUDES=yes \
MK_MAN_UTILS=yes
# We will handle building the toolchain and cross-compiler.
BSARGS+= MK_CROSS_COMPILER=no MK_CLANG=no