Skip to content

Commit 6472aa1

Browse files
authored
Merge pull request rust-lang#143 from ltratt/find_clang_format
Find clang-format if ykllvm is embedded as a submodule.
2 parents d2eab13 + d745944 commit 6472aa1

File tree

1 file changed

+14
-1
lines changed

1 file changed

+14
-1
lines changed

yk_format_new_files.sh

100644100755
Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,20 @@ set -e
1515

1616
YK_DIRS="./clang/test/Yk ./llvm/lib/Transforms/Yk ./llvm/include/llvm/Transforms/Yk llvm/lib/YkIR"
1717

18+
if ./build/bin/clang-format -version > /dev/null 2>&1; then
19+
clang_format=./build/bin/clang-format
20+
elif ../target/release/ykllvm/bin/clang-format -version > /dev/null 2>&1; then
21+
clang_format=../target/release/ykllvm/bin/clang-format
22+
elif ../target/debug/ykllvm/bin/clang-format -version > /dev/null 2>&1; then
23+
clang_format=../target/debug/ykllvm/bin/clang-format
24+
else
25+
echo "Can't find clang-format" > /dev/null
26+
exit 1
27+
fi
28+
clang_format=$(readlink -f "$clang_format")
29+
echo "Using $clang_format"
30+
1831
for dir in ${YK_DIRS}; do
1932
find ${dir} -type f -iname '*.cpp' -or -iname '*.h' -or -iname '*.c' | \
20-
xargs ./build/bin/clang-format -i
33+
xargs ${clang_format} -i
2134
done

0 commit comments

Comments
 (0)