Subzero: Use a "known" version of clang-format.

Makefile.standalone

 # The following variables will likely need to be modified, depending on where
 # and how you built LLVM & Clang. They can be overridden in a command-line
 # invocation of make, like:
 #
 #   make LLVM_SRC_PATH=<path> LLVM_BIN_PATH=<path> \
 #        LIBCXX_INSTALL_PATH=<path> CLANG_PATH=<path> ...
 #
 
 # LLVM_SRC_PATH is the path to the root of the checked out source code. This
 # directory should contain the configure script, the include/ and lib/
@@ skipping 139 matching lines @@
         @$(OBJDIR)/llvm2ice --build-atts
 
 .PHONY: all make_symlink
 
 # TODO(kschimpf): Fix python scripts to directly get build attributes
 # rather than generating $(OBJDIR)/llvm2ice.build_atts.
 $(OBJDIR)/llvm2ice: $(OBJS)
         $(CXX) $(LDFLAGS) -o $@ $^ $(LLVM_LDFLAGS) \
                -Wl,-rpath=$(abspath $(LIBCXX_INSTALL_PATH)/lib)
 
-# TODO: Be more precise than "*.h" here and elsewhere.
+# TODO(stichnot): Be more precise than "*.h" here and elsewhere.
 $(OBJS): $(OBJDIR)/%.o: src/%.cpp src/*.h src/*.def
         $(CXX) -c $(CXXFLAGS) $< -o $@
 
 $(OBJDIR)/run_unittests: $(UNITTEST_OBJS) $(UNITTEST_LIB_OBJS)
         $(CXX) $(LDFLAGS) -o $@ $^ $(LLVM_LDFLAGS) -lgtest -lgtest_main -ldl \
                -Wl,-rpath=$(abspath $(LIBCXX_INSTALL_PATH)/lib)
 
 $(UNITTEST_OBJS): $(OBJDIR)/unittest/%.o: unittest/%.cpp
         $(CXX) -c $(CXXFLAGS) \
                 -Isrc/ \
@@ skipping 19 matching lines @@
         $(OBJDIR)/run_unittests
 
 ifdef MINIMAL
 check: check-lit check-unit
         @echo "Crosstests ignored, minimal build"
 else
 check: check-lit check-unit
         (cd crosstest; ./runtests.sh)
 endif
 
-# TODO: Fix the use of wildcards.
-# Assumes clang-format is within $PATH.
 format:
-        clang-format -style=LLVM -i src/*.h src/*.cpp
+        $(LLVM_BIN_PATH)/clang-format -style=LLVM -i \
+        `find . -name "*.c" -o -name "*.cpp" -o -name "*.h"`

[jvoung (off chromium), 2015/01/27 18:08:11]

Would clang-format know what to do with .def files (like take the first line
comment -*- C++ -*- to guess that it is C++)?

[Jim Stichnoth, 2015/01/27 19:24:11]

Actually, clang-format is precisely the reason why I started using .def files
for x-macros instead of the more appropriate .h files.  They are deliberately
left out of "make format", and fortunately clang-format-diff.py chooses to
ignore them.

 
-# Assumes clang-format-diff.py is within $PATH, and that the
-# clang-format it calls is also within $PATH.  This may require adding
-# a component to $PATH, or creating symlinks within some existing
-# $PATH component.  Uses the one in /usr/lib/clang-format/ if it
-# exists.
-ifeq (,$(wildcard /usr/lib/clang-format/clang-format-diff.py))
-  CLANG_FORMAT_DIFF = clang-format-diff.py
-else
-  CLANG_FORMAT_DIFF = /usr/lib/clang-format/clang-format-diff.py
-endif
 format-diff:
         git diff -U0 `git merge-base HEAD master` | \
-        $(CLANG_FORMAT_DIFF) -p1 -style=LLVM -i
+        PATH=$(LLVM_BIN_PATH):$(PATH) \
+        $(LLVM_SRC_PATH)/../clang/tools/clang-format/clang-format-diff.py \
+        -p1 -style=LLVM -i
 
 clean:
         rm -rf llvm2ice *.o $(OBJDIR)
 
 clean-all: clean
         rm -rf build/