aboutsummaryrefslogtreecommitdiff
path: root/targets
diff options
context:
space:
mode:
authorConrad Meyer <cem@FreeBSD.org>2020-06-24 17:03:42 +0000
committerConrad Meyer <cem@FreeBSD.org>2020-06-24 17:03:42 +0000
commit0a9ab9f549b413fa2febee9706cf7d4e330f961a (patch)
treead355d54f6114efa21fb324877d058eab32015ec /targets
parent1388cfe1b500db39d4858083f333e50c0f80b5e4 (diff)
downloadsrc-0a9ab9f549b413fa2febee9706cf7d4e330f961a.tar.gz
src-0a9ab9f549b413fa2febee9706cf7d4e330f961a.zip
Add WITH_CLANG_FORMAT option
clang-format is enabled conditional on either WITH_CLANG_EXTRAS or WITH_CLANG_FORMAT. Some sources in libclang are build conditional on either rule, and obviously the clang-format binary itself depends on the rule. clang-format could still use a manual page. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D25427
Notes
Notes: svn path=/head/; revision=362587
Diffstat (limited to 'targets')
-rw-r--r--targets/pseudo/bootstrap-tools/Makefile2
-rw-r--r--targets/pseudo/clang/Makefile.depend5
2 files changed, 5 insertions, 2 deletions
diff --git a/targets/pseudo/bootstrap-tools/Makefile b/targets/pseudo/bootstrap-tools/Makefile
index 08ed40273c17..88b89a5c9d10 100644
--- a/targets/pseudo/bootstrap-tools/Makefile
+++ b/targets/pseudo/bootstrap-tools/Makefile
@@ -43,7 +43,7 @@ BSARGS= DESTDIR= \
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
diff --git a/targets/pseudo/clang/Makefile.depend b/targets/pseudo/clang/Makefile.depend
index 4d7b21cf64aa..29ac41e06ef2 100644
--- a/targets/pseudo/clang/Makefile.depend
+++ b/targets/pseudo/clang/Makefile.depend
@@ -42,7 +42,6 @@ DIRDEPS+= \
.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 @@ DIRDEPS+= \
.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