Page MenuHomeFreeBSD
Files F151871855

D31399.diff
No OneTemporary
Actions

D31399.diff
View Options

diff --git a/Makefile.inc1 b/Makefile.inc1
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -715,13 +715,25 @@
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 @@
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 @@
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
--- a/Makefile.libcompat
+++ b/Makefile.libcompat
@@ -103,9 +103,14 @@
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
--- a/targets/pseudo/bootstrap-tools/Makefile
+++ b/targets/pseudo/bootstrap-tools/Makefile
@@ -40,12 +40,23 @@
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

File Metadata

Mime Type
text/plain
Expires
Sun, Apr 12, 6:16 AM (14 h, 4 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31333276
Default Alt Text
D31399.diff (3 KB)

Event Timeline