Mirrors/openssl
0
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2026-01-18 17:11:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix make check-format target

Browse Source 
With our move to clang-format we no longer have a check-format script,
and so this make target is broken.

Fix it up to use clang-format-diff instead

Fixes #29594

Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
MergeDate: Fri Jan 16 14:37:09 2026
(Merged from https://github.com/openssl/openssl/pull/29634)

(cherry picked from commit 90d6c3b260)
This commit is contained in:
Neil Horman
2026-01-14 08:15:36 -05:00
parent 10460ef691
commit 4902303e85
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Configurations/unix-Makefile.tmpl
View File

@@ -1205,10 +1205,18 @@ lint: ## Evaluate C code via "splint"
echo splint -DLINT -posixlib -preproc -D__gnuc_va_list=void \
-I. -Iinclude -Iapps/include $(CRYPTOHEADERS) $(SSLHEADERS) $(SRCS) )
.PHONY: check-format
check-format: ## Evaluate C code according to OpenSSL coding standards
( cd $(SRCDIR); $(PERL) util/check-format.pl \
$(SRCS) \$(CRYPTOHEADERS) $(SSLHEADERS) )
CLANG_FORMAT_DIFF = clang-format-diff
.PHONY: check-format check-clang-format-diff-cmd
check-clang-format-diff-cmd:
@if ! command -v "$(CLANG_FORMAT_DIFF)" >/dev/null; then \
echo "Unable to find ${CLANG_FORMAT_DIFF}";\
echo "Please set the CLANG_FORMAT_DIFF variable to your clang-format-diff command";\
exit 1;\
fi
check-format: check-clang-format-diff-cmd ## Evaluate C code according to OpenSSL coding standards
( cd $(SRCDIR); git diff -U0 --no-prefix --no-color | $(CLANG_FORMAT_DIFF) )
generate_apps:
( cd $(SRCDIR); $(PERL) VMS/VMSify-conf.pl \