| 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 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 212 # LLVM cmake build | 212 # LLVM cmake build |
| 213 LLVM_LIBS := $(LLVM_LIBS_LIST) | 213 LLVM_LIBS := $(LLVM_LIBS_LIST) |
| 214 # For the cmake build, the gtest libs end up in the same place as the LLVM | 214 # For the cmake build, the gtest libs end up in the same place as the LLVM |
| 215 # libs, so no "-L..." arg is needed. | 215 # libs, so no "-L..." arg is needed. |
| 216 GTEST_LIB_PATH ?= | 216 GTEST_LIB_PATH ?= |
| 217 CLANG_FORMAT_PATH ?= $(PNACL_BIN_PATH) | 217 CLANG_FORMAT_PATH ?= $(PNACL_BIN_PATH) |
| 218 else | 218 else |
| 219 # LLVM autoconf build | 219 # LLVM autoconf build |
| 220 LLVM_LIBS := -lLLVM-3.7svn | 220 LLVM_LIBS := -lLLVM-3.7svn |
| 221 GTEST_LIB_PATH ?= -L../../out/llvm_x86_64_linux_work/Release+Asserts/lib | 221 GTEST_LIB_PATH ?= -L../../out/llvm_x86_64_linux_work/Release+Asserts/lib |
| 222 CLANG_FORMAT_PATH ?= ../../out/llvm_x86_64_linux_work/Release+Asserts/bin | 222 ifneq ($(wildcard ../../out/llvm_x86_64_linux_work/Release+Asserts/bin/clang-f
ormat),) |
| 223 CLANG_FORMAT_PATH ?= ../../out/llvm_x86_64_linux_work/Release+Asserts/bin |
| 224 else |
| 225 CLANG_FORMAT_PATH ?= ../../out/llvm_x86_64_linux_debug_work/Debug+Asserts/bi
n |
| 226 endif |
| 223 endif | 227 endif |
| 224 | 228 |
| 225 LLVM_LDFLAGS := $(LLVM_LIBS) \ | 229 LLVM_LDFLAGS := $(LLVM_LIBS) \ |
| 226 `$(PNACL_BIN_PATH)/llvm-config --ldflags` \ | 230 `$(PNACL_BIN_PATH)/llvm-config --ldflags` \ |
| 227 `$(PNACL_BIN_PATH)/llvm-config --system-libs` | 231 `$(PNACL_BIN_PATH)/llvm-config --system-libs` |
| 228 SB_LLVM_LDFLAGS := -Wl,--start-group $(LLVM_LIBS_LIST) -Wl,--end-group \ | 232 SB_LLVM_LDFLAGS := -Wl,--start-group $(LLVM_LIBS_LIST) -Wl,--end-group \ |
| 229 -L$(SB_LLVM_PATH)/lib | 233 -L$(SB_LLVM_PATH)/lib |
| 230 | 234 |
| 231 CCACHE := `command -v ccache` | 235 CCACHE := `command -v ccache` |
| 232 CXX := CCACHE_CPP2=yes $(CCACHE) $(CLANG_PATH)/clang++ | 236 CXX := CCACHE_CPP2=yes $(CCACHE) $(CLANG_PATH)/clang++ |
| (...skipping 549 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 782 | 786 |
| 783 help-check-xtest: | 787 help-check-xtest: |
| 784 @cat Makefile.standalone-help/check-xtest.txt | 788 @cat Makefile.standalone-help/check-xtest.txt |
| 785 | 789 |
| 786 clean: | 790 clean: |
| 787 rm -rf pnacl-sz *.o $(foreach nexe,$(NEXES),$(notdir $(nexe))) \ | 791 rm -rf pnacl-sz *.o $(foreach nexe,$(NEXES),$(notdir $(nexe))) \ |
| 788 $(OBJDIR) $(SB_OBJDIR) $(SBB_OBJDIR) build/*.bloat.json | 792 $(OBJDIR) $(SB_OBJDIR) $(SBB_OBJDIR) build/*.bloat.json |
| 789 | 793 |
| 790 clean-all: clean | 794 clean-all: clean |
| 791 rm -rf build/ crosstest/Output/ | 795 rm -rf build/ crosstest/Output/ |
| OLD | NEW |