git: bcd2f41f7d22 - main - mk: format some option lists
Mitchell Horne
mhorne at FreeBSD.org
Wed Aug 4 18:24:33 UTC 2021
The branch main has been updated by mhorne:
URL: https://cgit.FreeBSD.org/src/commit/?id=bcd2f41f7d222a942fe0a268614b46d3ec3af4c0
commit bcd2f41f7d222a942fe0a268614b46d3ec3af4c0
Author: Mitchell Horne <mhorne at FreeBSD.org>
AuthorDate: 2021-08-04 18:17:34 +0000
Commit: Mitchell Horne <mhorne at FreeBSD.org>
CommitDate: 2021-08-04 18:23:22 +0000
mk: format some option lists
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
---
Makefile.inc1 | 54 ++++++++++++++++++++++++---------
Makefile.libcompat | 11 +++++--
targets/pseudo/bootstrap-tools/Makefile | 23 ++++++++++----
3 files changed, 65 insertions(+), 23 deletions(-)
diff --git a/Makefile.inc1 b/Makefile.inc1
index b6843177c10b..b61ed693af77 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -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} \
diff --git a/Makefile.libcompat b/Makefile.libcompat
index c2be63c29e73..88b1e3f0cf18 100644
--- a/Makefile.libcompat
+++ b/Makefile.libcompat
@@ -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
diff --git a/targets/pseudo/bootstrap-tools/Makefile b/targets/pseudo/bootstrap-tools/Makefile
index 0023f763af83..1a7f2bd15ad0 100644
--- a/targets/pseudo/bootstrap-tools/Makefile
+++ b/targets/pseudo/bootstrap-tools/Makefile
@@ -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
More information about the dev-commits-src-all
mailing list