| 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 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 182 LLVM_EXTRA_WARNINGS := -Wcovered-switch-default | 182 LLVM_EXTRA_WARNINGS := -Wcovered-switch-default |
| 183 | 183 |
| 184 # Use g++ to compile, to check for errors/warnings that clang++ might have | 184 # Use g++ to compile, to check for errors/warnings that clang++ might have |
| 185 # missed. It's unlikely to link, unless LLVM was also built with g++, so the | 185 # missed. It's unlikely to link, unless LLVM was also built with g++, so the |
| 186 # compile_only target should be used. Note: This ifdef section is deliberately | 186 # compile_only target should be used. Note: This ifdef section is deliberately |
| 187 # placed here instead of with the other ifdef sections, so that its redefinition | 187 # placed here instead of with the other ifdef sections, so that its redefinition |
| 188 # of CXX/STDLIB_FLAGS/LLVM_EXTRA_WARNINGS follows their normal definitions. | 188 # of CXX/STDLIB_FLAGS/LLVM_EXTRA_WARNINGS follows their normal definitions. |
| 189 ifdef GPLUSPLUS | 189 ifdef GPLUSPLUS |
| 190 CXX := CCACHE_CPP2=yes $(CCACHE) g++ | 190 CXX := CCACHE_CPP2=yes $(CCACHE) g++ |
| 191 STDLIB_FLAGS := | 191 STDLIB_FLAGS := |
| 192 LLVM_EXTRA_WARNINGS := -Wno-unknown-pragmas -Wno-unused-parameter \ | 192 LLVM_EXTRA_WARNINGS := \ |
| 193 -Wno-comment -Wno-enum-compare -Wno-strict-aliasing \ | 193 -Wcast-qual \ |
| 194 -Wno-return-type | 194 -Wno-comment \ |
| 195 -Wno-long-long \ |
| 196 -Wno-maybe-uninitialized \ |
| 197 -Wno-missing-field-initializers \ |
| 198 -Wno-unused-parameter \ |
| 199 -Wwrite-strings |
| 195 OBJDIR := $(OBJDIR)+Gplusplus | 200 OBJDIR := $(OBJDIR)+Gplusplus |
| 196 endif | 201 endif |
| 197 | 202 |
| 198 BASE_CXXFLAGS := -std=gnu++11 -Wall -Wextra -Werror -fno-rtti \ | 203 BASE_CXXFLAGS := -std=gnu++11 -Wall -Wextra -Werror -fno-rtti \ |
| 199 -fno-exceptions $(OPTLEVEL) $(ASSERTIONS) -g -pedantic \ | 204 -fno-exceptions $(OPTLEVEL) $(ASSERTIONS) -g -pedantic \ |
| 200 $(LLVM_EXTRA_WARNINGS) $(CXX_EXTRA) | 205 $(LLVM_EXTRA_WARNINGS) $(CXX_EXTRA) |
| 201 | 206 |
| 202 CXXFLAGS := $(LLVM_CXXFLAGS) $(BASE_CXXFLAGS) $(CXX_DEFINES) $(HOST_FLAGS) \ | 207 CXXFLAGS := $(LLVM_CXXFLAGS) $(BASE_CXXFLAGS) $(CXX_DEFINES) $(HOST_FLAGS) \ |
| 203 $(STDLIB_FLAGS) | 208 $(STDLIB_FLAGS) |
| 204 SB_CXXFLAGS := $(SB_LLVM_CXXFLAGS) $(BASE_CXXFLAGS) $(SB_CXX_DEFINES) | 209 SB_CXXFLAGS := $(SB_LLVM_CXXFLAGS) $(BASE_CXXFLAGS) $(SB_CXX_DEFINES) |
| (...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 513 @echo See Subzero size breakdown in bloat/pnacl-sz.bloat.html | 518 @echo See Subzero size breakdown in bloat/pnacl-sz.bloat.html |
| 514 | 519 |
| 515 docs: | 520 docs: |
| 516 make -C docs -f Makefile.standalone | 521 make -C docs -f Makefile.standalone |
| 517 | 522 |
| 518 clean: | 523 clean: |
| 519 rm -rf pnacl-sz *.o $(OBJDIR) $(SB_OBJDIR) build/pnacl-sz.bloat.json | 524 rm -rf pnacl-sz *.o $(OBJDIR) $(SB_OBJDIR) build/pnacl-sz.bloat.json |
| 520 | 525 |
| 521 clean-all: clean | 526 clean-all: clean |
| 522 rm -rf build/ crosstest/Output/ | 527 rm -rf build/ crosstest/Output/ |
| OLD | NEW |