| 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 LLVM_CXXFLAGS := `$(LLVM_BIN_PATH)/llvm-config --cxxflags` | 48 LLVM_CXXFLAGS := `$(LLVM_BIN_PATH)/llvm-config --cxxflags` |
| 49 LLVM_LDFLAGS := `$(LLVM_BIN_PATH)/llvm-config --libs` \ | 49 LLVM_LDFLAGS := `$(LLVM_BIN_PATH)/llvm-config --libs` \ |
| 50 `$(LLVM_BIN_PATH)/llvm-config --ldflags` | 50 `$(LLVM_BIN_PATH)/llvm-config --ldflags` |
| 51 | 51 |
| 52 # It's recommended that CXX matches the compiler you used to build LLVM itself. | 52 # It's recommended that CXX matches the compiler you used to build LLVM itself. |
| 53 OPTLEVEL := -O0 | 53 OPTLEVEL := -O0 |
| 54 CCACHE := `command -v ccache` | 54 CCACHE := `command -v ccache` |
| 55 CXX := CCACHE_CPP2=yes $(CCACHE) $(CLANG_PATH)/clang++ | 55 CXX := CCACHE_CPP2=yes $(CCACHE) $(CLANG_PATH)/clang++ |
| 56 | 56 |
| 57 CXXFLAGS := $(LLVM_CXXFLAGS) -Wall -Wextra -Werror -fno-rtti \ | 57 CXXFLAGS := $(LLVM_CXXFLAGS) -std=c++11 -Wall -Wextra -Werror -fno-rtti \ |
| 58 -fno-exceptions $(OPTLEVEL) -g $(HOST_FLAGS) \ | 58 -fno-exceptions $(OPTLEVEL) -g $(HOST_FLAGS) \ |
| 59 -Wno-error=unused-parameter -I$(LIBCXX_INSTALL_PATH)/include/c++/v1 | 59 -Wno-error=unused-parameter -I$(LIBCXX_INSTALL_PATH)/include/c++/v1 |
| 60 LDFLAGS := $(HOST_FLAGS) -L$(LIBCXX_INSTALL_PATH)/lib | 60 LDFLAGS := $(HOST_FLAGS) -L$(LIBCXX_INSTALL_PATH)/lib |
| 61 | 61 |
| 62 SRCS= \ | 62 SRCS= \ |
| 63 assembler.cpp \ | 63 assembler.cpp \ |
| 64 assembler_ia32.cpp \ | 64 assembler_ia32.cpp \ |
| 65 IceCfg.cpp \ | 65 IceCfg.cpp \ |
| 66 IceCfgNode.cpp \ | 66 IceCfgNode.cpp \ |
| 67 IceConverter.cpp \ | 67 IceConverter.cpp \ |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 123 CLANG_FORMAT_DIFF = clang-format-diff.py | 123 CLANG_FORMAT_DIFF = clang-format-diff.py |
| 124 else | 124 else |
| 125 CLANG_FORMAT_DIFF = /usr/lib/clang-format/clang-format-diff.py | 125 CLANG_FORMAT_DIFF = /usr/lib/clang-format/clang-format-diff.py |
| 126 endif | 126 endif |
| 127 format-diff: | 127 format-diff: |
| 128 git diff -U0 `git merge-base HEAD master` | \ | 128 git diff -U0 `git merge-base HEAD master` | \ |
| 129 $(CLANG_FORMAT_DIFF) -p1 -style=LLVM -i | 129 $(CLANG_FORMAT_DIFF) -p1 -style=LLVM -i |
| 130 | 130 |
| 131 clean: | 131 clean: |
| 132 rm -rf llvm2ice *.o build/ | 132 rm -rf llvm2ice *.o build/ |
| OLD | NEW |