Skip to content

Commit 3f172e3

Browse files
Merge pull request commonmark#294 from kevinbackhouse/clang-format-version
Use up-to-date clang-format
2 parents ec05e4f + dc3c3f2 commit 3f172e3

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ VERSION?=$(SPECVERSION)
2222
RELEASE?=CommonMark-$(VERSION)
2323
INSTALL_PREFIX?=/usr/local
2424
CLANG_CHECK?=clang-check
25-
CLANG_FORMAT=clang-format-3.5 -style llvm -sort-includes=0 -i
25+
CLANG_FORMAT=clang-format -style llvm -sort-includes=0 -i
2626
AFL_PATH?=/usr/local/bin
2727

2828
.PHONY: all cmake_build leakcheck clean fuzztest test debug ubsan asan mingw archive newbench bench format update-spec afl clang-check docker libFuzzer
@@ -140,7 +140,7 @@ $(EXTDIR)/ext_scanners.c: $(EXTDIR)/ext_scanners.re
140140
esac
141141
re2c --case-insensitive -b -i --no-generation-date -8 \
142142
--encoding-policy substitute -o $@ $<
143-
clang-format-3.5 -style llvm -i $@
143+
clang-format -style llvm -i $@
144144

145145
# We include entities.inc in the repository, so normally this
146146
# doesn't need to be regenerated:
@@ -211,7 +211,7 @@ format:
211211
$(CLANG_FORMAT) src/*.c src/*.h api_test/*.c api_test/*.h
212212

213213
format-extensions:
214-
clang-format-3.5 -style llvm -i extensions/*.c extensions/*.h
214+
clang-format -style llvm -i extensions/*.c extensions/*.h
215215

216216
operf: $(CMARK)
217217
operf $< < $(BENCHFILE) > /dev/null

tools/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ RUN apt-get update && apt-get install -y \
1212
wget \
1313
clang \
1414
man \
15-
clang-format-3.5 \
15+
clang-format \
1616
&& apt-get clean
1717

1818
RUN wget http://lcamtuf.coredump.cx/afl/releases/afl-latest.tgz && \

0 commit comments

Comments
 (0)