| 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> LIBCXX_INSTALL_PATH=<path> CLANG_PATH=<path> \ | 5 # make LLVM_SRC_PATH=<path> LIBCXX_INSTALL_PATH=<path> CLANG_PATH=<path> \ |
| 6 # PNACL_BIN_PATH=<path> ... | 6 # PNACL_BIN_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 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 95 ASSERTIONS = | 95 ASSERTIONS = |
| 96 OBJDIR := $(OBJDIR)+Asserts | 96 OBJDIR := $(OBJDIR)+Asserts |
| 97 endif | 97 endif |
| 98 | 98 |
| 99 ifdef TSAN | 99 ifdef TSAN |
| 100 OBJDIR := $(OBJDIR)+TSan | 100 OBJDIR := $(OBJDIR)+TSan |
| 101 CXX_EXTRA += -fsanitize=thread | 101 CXX_EXTRA += -fsanitize=thread |
| 102 LD_EXTRA += -fsanitize=thread | 102 LD_EXTRA += -fsanitize=thread |
| 103 endif | 103 endif |
| 104 | 104 |
| 105 ifdef ASAN |
| 106 OBJDIR := $(OBJDIR)+ASan |
| 107 CXX_EXTRA += -fsanitize=address |
| 108 LD_EXTRA += -fsanitize=address |
| 109 endif |
| 110 |
| 105 SB_OBJDIR := $(OBJDIR)+Sandboxed | 111 SB_OBJDIR := $(OBJDIR)+Sandboxed |
| 106 | 112 |
| 107 $(info -----------------------------------------------) | 113 $(info -----------------------------------------------) |
| 108 $(info Using LLVM_SRC_PATH = $(LLVM_SRC_PATH)) | 114 $(info Using LLVM_SRC_PATH = $(LLVM_SRC_PATH)) |
| 109 $(info Using SB_LLVM_PATH = $(SB_LLVM_PATH)) | 115 $(info Using SB_LLVM_PATH = $(SB_LLVM_PATH)) |
| 110 $(info Using NACL_ROOT = $(NACL_ROOT)) | 116 $(info Using NACL_ROOT = $(NACL_ROOT)) |
| 111 $(info Using TOOLCHAIN_ROOT = $(TOOLCHAIN_ROOT)) | 117 $(info Using TOOLCHAIN_ROOT = $(TOOLCHAIN_ROOT)) |
| 112 $(info Using PNACL_TOOLCHAIN_ROOT = $(PNACL_TOOLCHAIN_ROOT)) | 118 $(info Using PNACL_TOOLCHAIN_ROOT = $(PNACL_TOOLCHAIN_ROOT)) |
| 113 $(info Using PNACL_BIN_PATH = $(PNACL_BIN_PATH)) | 119 $(info Using PNACL_BIN_PATH = $(PNACL_BIN_PATH)) |
| 114 $(info Using CLANG_PATH = $(CLANG_PATH)) | 120 $(info Using CLANG_PATH = $(CLANG_PATH)) |
| (...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 372 | 378 |
| 373 docs: | 379 docs: |
| 374 doxygen Doxyfile | 380 doxygen Doxyfile |
| 375 @echo See file://`pwd`/docs/html/index.html | 381 @echo See file://`pwd`/docs/html/index.html |
| 376 | 382 |
| 377 clean: | 383 clean: |
| 378 rm -rf pnacl-sz *.o $(OBJDIR) $(SB_OBJDIR) build/pnacl-sz.bloat.json | 384 rm -rf pnacl-sz *.o $(OBJDIR) $(SB_OBJDIR) build/pnacl-sz.bloat.json |
| 379 | 385 |
| 380 clean-all: clean | 386 clean-all: clean |
| 381 rm -rf build/ docs/ | 387 rm -rf build/ docs/ |
| OLD | NEW |