| 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 # LIBCXX_INSTALL_PATH=<path> CLANG_PATH=<path> ... | 6 # LIBCXX_INSTALL_PATH=<path> CLANG_PATH=<path> ... |
| 7 # | 7 # |
| 8 | 8 |
| 9 # LLVM_SRC_PATH is the path to the root of the checked out source code. This | 9 # LLVM_SRC_PATH is the path to the root of the checked out source code. This |
| 10 # directory should contain the configure script, the include/ and lib/ | 10 # directory should contain the configure script, the include/ and lib/ |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 | 47 |
| 48 # The list of CXX defines that are dependent on build parameters. | 48 # The list of CXX defines that are dependent on build parameters. |
| 49 CXX_DEFINES = | 49 CXX_DEFINES = |
| 50 CXX_EXTRA = | 50 CXX_EXTRA = |
| 51 LD_EXTRA = | 51 LD_EXTRA = |
| 52 | 52 |
| 53 ifdef MINIMAL | 53 ifdef MINIMAL |
| 54 NOASSERT = 1 | 54 NOASSERT = 1 |
| 55 OBJDIR := $(OBJDIR)+Min | 55 OBJDIR := $(OBJDIR)+Min |
| 56 CXX_DEFINES += -DALLOW_DUMP=0 -DALLOW_LLVM_CL=0 -DALLOW_LLVM_IR=0 \ | 56 CXX_DEFINES += -DALLOW_DUMP=0 -DALLOW_LLVM_CL=0 -DALLOW_LLVM_IR=0 \ |
| 57 » -DALLOW_LLVM_IR_AS_INPUT=0 -DALLOW_DISABLE_IR_GEN=0 | 57 » -DALLOW_LLVM_IR_AS_INPUT=0 -DALLOW_DISABLE_IR_GEN=0 \ |
| 58 -DALLOW_MINIMAL_BUILD=1 |
| 58 else | 59 else |
| 59 CXX_DEFINES += -DALLOW_DUMP=1 -DALLOW_LLVM_CL=1 -DALLOW_LLVM_IR=1 \ | 60 CXX_DEFINES += -DALLOW_DUMP=1 -DALLOW_LLVM_CL=1 -DALLOW_LLVM_IR=1 \ |
| 60 » -DALLOW_LLVM_IR_AS_INPUT=1 -DALLOW_DISABLE_IR_GEN=1 | 61 » -DALLOW_LLVM_IR_AS_INPUT=1 -DALLOW_DISABLE_IR_GEN=1 \ |
| 62 -DALLOW_MINIMAL_BUILD=0 |
| 61 endif | 63 endif |
| 62 | 64 |
| 63 ifdef NOASSERT | 65 ifdef NOASSERT |
| 64 ASSERTIONS = -DNDEBUG | 66 ASSERTIONS = -DNDEBUG |
| 65 else | 67 else |
| 66 ASSERTIONS = | 68 ASSERTIONS = |
| 67 OBJDIR := $(OBJDIR)+Asserts | 69 OBJDIR := $(OBJDIR)+Asserts |
| 68 endif | 70 endif |
| 69 | 71 |
| 70 ifdef TSAN | 72 ifdef TSAN |
| (...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 209 git diff -U0 `git merge-base HEAD master` | \ | 211 git diff -U0 `git merge-base HEAD master` | \ |
| 210 PATH=$(LLVM_BIN_PATH):$(PATH) \ | 212 PATH=$(LLVM_BIN_PATH):$(PATH) \ |
| 211 $(LLVM_SRC_PATH)/../clang/tools/clang-format/clang-format-diff.py \ | 213 $(LLVM_SRC_PATH)/../clang/tools/clang-format/clang-format-diff.py \ |
| 212 -p1 -style=LLVM -i | 214 -p1 -style=LLVM -i |
| 213 | 215 |
| 214 clean: | 216 clean: |
| 215 rm -rf llvm2ice *.o $(OBJDIR) | 217 rm -rf llvm2ice *.o $(OBJDIR) |
| 216 | 218 |
| 217 clean-all: clean | 219 clean-all: clean |
| 218 rm -rf build/ | 220 rm -rf build/ |
| OLD | NEW |