Page MenuHomeFreeBSD
Files F153247025

D25427.id73581.diff
No OneTemporary
Actions

D25427.id73581.diff
View Options

Index: Makefile.inc1
===================================================================
--- Makefile.inc1
+++ Makefile.inc1
@@ -676,7 +676,7 @@
MK_HTML=no NO_LINT=yes MK_MAN=no \
-DNO_PIC MK_PROFILE=no -DNO_SHARED \
-DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
- MK_CLANG_EXTRAS=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_INCLUDES=yes
@@ -697,7 +697,7 @@
SSP_CFLAGS= \
-DNO_LINT \
-DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
- MK_CLANG_EXTRAS=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
# cross-tools stage
@@ -2577,6 +2577,7 @@
SSP_CFLAGS= \
MK_CASPER=no \
MK_CLANG_EXTRAS=no \
+ MK_CLANG_FORMAT=no \
MK_CLANG_FULL=no \
MK_CTF=no \
MK_DEBUG_FILES=no \
Index: lib/clang/libclang/Makefile
===================================================================
--- lib/clang/libclang/Makefile
+++ lib/clang/libclang/Makefile
@@ -22,7 +22,7 @@
# Explanation of different SRCS variants below:
# SRCS_MIN: always required, even for bootstrap
-# SRCS_EXT: required for MK_CLANG_EXTRAS
+# SRCS_EXT: required for MK_CLANG_EXTRAS || MK_CLANG_FORMAT
# SRCS_FUL: required for MK_CLANG_FULL
# SRCS_LDB: required for MK_LLDB
@@ -686,7 +686,7 @@
SRCS_MIN+= Tooling/Tooling.cpp
SRCS_ALL+= ${SRCS_MIN}
-.if ${MK_CLANG_EXTRAS} != "no"
+.if ${MK_CLANG_EXTRAS} != "no" || ${MK_CLANG_FORMAT} != "no"
SRCS_ALL+= ${SRCS_EXT}
.endif
.if ${MK_CLANG_FULL} != "no"
Index: share/mk/src.opts.mk
===================================================================
--- share/mk/src.opts.mk
+++ share/mk/src.opts.mk
@@ -202,6 +202,7 @@
BHYVE_SNAPSHOT \
BSD_GREP \
CLANG_EXTRAS \
+ CLANG_FORMAT \
DTRACE_TESTS \
EXPERIMENTAL \
GNU_GREP_COMPAT \
@@ -482,6 +483,7 @@
.if ${MK_CLANG} == "no"
MK_CLANG_EXTRAS:= no
+MK_CLANG_FORMAT:= no
MK_CLANG_FULL:= no
MK_LLVM_COV:= no
.endif
Index: targets/pseudo/bootstrap-tools/Makefile
===================================================================
--- targets/pseudo/bootstrap-tools/Makefile
+++ targets/pseudo/bootstrap-tools/Makefile
@@ -43,7 +43,7 @@
MK_HTML=no NO_LINT=yes MK_MAN=no \
-DNO_PIC MK_PROFILE=no -DNO_SHARED \
-DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
- MK_CLANG_EXTRAS=no MK_CLANG_FULL=no \
+ MK_CLANG_EXTRAS=no MK_CLANG_FORMAT=no MK_CLANG_FULL=no \
MK_LLDB=no MK_TESTS=no \
MK_INCLUDES=yes
Index: targets/pseudo/clang/Makefile.depend
===================================================================
--- targets/pseudo/clang/Makefile.depend
+++ targets/pseudo/clang/Makefile.depend
@@ -42,7 +42,6 @@
.if ${MK_CLANG_EXTRAS} == "yes"
DIRDEPS+= \
usr.bin/clang/bugpoint \
- usr.bin/clang/clang-format \
usr.bin/clang/llc \
usr.bin/clang/lli \
usr.bin/clang/llvm-ar \
@@ -71,6 +70,10 @@
.endif
+.if ${MK_CLANG_EXTRAS} == "yes" || ${MK_CLANG_FORMAT} == "yes"
+DIRDEPS+= usr.bin/clang/clang-format
+.endif
+
.if ${MK_LLD} == "yes"
DIRDEPS+= usr.bin/clang/lld
.endif
Index: tools/build/mk/OptionalObsoleteFiles.inc
===================================================================
--- tools/build/mk/OptionalObsoleteFiles.inc
+++ tools/build/mk/OptionalObsoleteFiles.inc
@@ -1481,7 +1481,6 @@
.if ${MK_CLANG_EXTRAS} == no
OLD_FILES+=usr/bin/bugpoint
-OLD_FILES+=usr/bin/clang-format
OLD_FILES+=usr/bin/llc
OLD_FILES+=usr/bin/lli
OLD_FILES+=usr/bin/llvm-as
@@ -1517,6 +1516,10 @@
OLD_FILES+=usr/share/man/man1/opt.1.gz
.endif
+.if ${MK_CLANG_EXTRAS} == no && ${MK_CLANG_FORMAT} == no
+OLD_FILES+=usr/bin/clang-format
+.endif
+
.if ${MK_CPP} == no
OLD_FILES+=usr/bin/cpp
OLD_FILES+=usr/share/man/man1/cpp.1.gz
Index: tools/build/options/WITH_CLANG_FORMAT
===================================================================
--- /dev/null
+++ tools/build/options/WITH_CLANG_FORMAT
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Set to build clang-format.
Index: usr.bin/clang/Makefile
===================================================================
--- usr.bin/clang/Makefile
+++ usr.bin/clang/Makefile
@@ -18,7 +18,6 @@
.if ${MK_CLANG_EXTRAS} != "no"
SUBDIR+= bugpoint
-SUBDIR+= clang-format
SUBDIR+= llc
SUBDIR+= lli
SUBDIR+= llvm-as
@@ -42,6 +41,10 @@
SUBDIR+= opt
.endif
+.if ${MK_CLANG_EXTRAS} != "no" || ${MK_CLANG_FORMAT} != "no"
+SUBDIR+= clang-format
+.endif
+
.if ${MK_LLD} != "no"
SUBDIR+= lld
.endif

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 21, 1:21 AM (15 h, 58 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31877078
Default Alt Text
D25427.id73581.diff (4 KB)

Event Timeline