| OLD | NEW |
| 1 # The following variables will likely need to be modified, depending on where | 1 # The following variables will likely need to be modified, depending on where |
| 2 # and how you built LLVM & Clang. They can be overridden in a command-line | 2 # and how you built LLVM & Clang. They can be overridden in a command-line |
| 3 # invocation of make, like: | 3 # invocation of make, like: |
| 4 # | 4 # |
| 5 # make LLVM_SRC_PATH=<path> LLVM_BIN_PATH=<path> ... | 5 # make LLVM_SRC_PATH=<path> LLVM_BIN_PATH=<path> ... |
| 6 # | 6 # |
| 7 | 7 |
| 8 # LLVM_SRC_PATH is the path to the root of the checked out source code. This | 8 # LLVM_SRC_PATH is the path to the root of the checked out source code. This |
| 9 # directory should contain the configure script, the include/ and lib/ | 9 # directory should contain the configure script, the include/ and lib/ |
| 10 # directories of LLVM, Clang in tools/clang/, etc. | 10 # directories of LLVM, Clang in tools/clang/, etc. |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 | 76 |
| 77 # TODO: Be more precise than "*.h" here and elsewhere. | 77 # TODO: Be more precise than "*.h" here and elsewhere. |
| 78 $(OBJS): build/%.o: src/%.cpp src/*.h src/*.def | 78 $(OBJS): build/%.o: src/%.cpp src/*.h src/*.def |
| 79 $(CXX) -c $(CXXFLAGS) $< -o $@ | 79 $(CXX) -c $(CXXFLAGS) $< -o $@ |
| 80 | 80 |
| 81 $(OBJS): | build | 81 $(OBJS): | build |
| 82 | 82 |
| 83 build: | 83 build: |
| 84 @mkdir -p $@ | 84 @mkdir -p $@ |
| 85 | 85 |
| 86 check: llvm2ice | 86 check-lit: llvm2ice |
| 87 LLVM_BIN_PATH=$(LLVM_BIN_PATH) \ | 87 LLVM_BIN_PATH=$(LLVM_BIN_PATH) \ |
| 88 $(LLVM_SRC_PATH)/utils/lit/lit.py -sv tests_lit | 88 $(LLVM_SRC_PATH)/utils/lit/lit.py -sv tests_lit |
| 89 |
| 90 check: check-lit |
| 89 (cd crosstest; LLVM_BIN_PATH=$(LLVM_BIN_PATH) ./runtests.sh) | 91 (cd crosstest; LLVM_BIN_PATH=$(LLVM_BIN_PATH) ./runtests.sh) |
| 90 | 92 |
| 91 # TODO: Fix the use of wildcards. | 93 # TODO: Fix the use of wildcards. |
| 92 # Assumes clang-format is within $PATH. | 94 # Assumes clang-format is within $PATH. |
| 93 format: | 95 format: |
| 94 clang-format -style=LLVM -i src/*.h src/*.cpp | 96 clang-format -style=LLVM -i src/*.h src/*.cpp |
| 95 | 97 |
| 96 # Assumes clang-format-diff.py is within $PATH, and that the | 98 # Assumes clang-format-diff.py is within $PATH, and that the |
| 97 # clang-format it calls is also within $PATH. This may require adding | 99 # clang-format it calls is also within $PATH. This may require adding |
| 98 # a component to $PATH, or creating symlinks within some existing | 100 # a component to $PATH, or creating symlinks within some existing |
| 99 # $PATH component. Uses the one in /usr/lib/clang-format/ if it | 101 # $PATH component. Uses the one in /usr/lib/clang-format/ if it |
| 100 # exists. | 102 # exists. |
| 101 ifeq (,$(wildcard /usr/lib/clang-format/clang-format-diff.py)) | 103 ifeq (,$(wildcard /usr/lib/clang-format/clang-format-diff.py)) |
| 102 CLANG_FORMAT_DIFF = clang-format-diff.py | 104 CLANG_FORMAT_DIFF = clang-format-diff.py |
| 103 else | 105 else |
| 104 CLANG_FORMAT_DIFF = /usr/lib/clang-format/clang-format-diff.py | 106 CLANG_FORMAT_DIFF = /usr/lib/clang-format/clang-format-diff.py |
| 105 endif | 107 endif |
| 106 format-diff: | 108 format-diff: |
| 107 git diff -U0 `git merge-base HEAD master` | \ | 109 git diff -U0 `git merge-base HEAD master` | \ |
| 108 $(CLANG_FORMAT_DIFF) -p1 -style=LLVM -i | 110 $(CLANG_FORMAT_DIFF) -p1 -style=LLVM -i |
| 109 | 111 |
| 110 clean: | 112 clean: |
| 111 rm -rf llvm2ice *.o build/ | 113 rm -rf llvm2ice *.o build/ |
| OLD | NEW |