Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1592)

Side by Side Diff: Makefile.standalone

Issue 1876413002: Subzero. WASM. Additional progress. (Closed) Base URL: https://chromium.googlesource.com/native_client/pnacl-subzero.git@master
Patch Set: Code review feedback and merging with master Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « .gitignore ('k') | README-wasm.md » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 -Wno-long-long \ 249 -Wno-long-long \
250 -Wno-maybe-uninitialized \ 250 -Wno-maybe-uninitialized \
251 -Wno-missing-field-initializers \ 251 -Wno-missing-field-initializers \
252 -Wno-unused-parameter \ 252 -Wno-unused-parameter \
253 -Wwrite-strings 253 -Wwrite-strings
254 OBJDIR := $(OBJDIR)+Gplusplus 254 OBJDIR := $(OBJDIR)+Gplusplus
255 endif 255 endif
256 256
257 BASE_CXXFLAGS := -std=gnu++11 -Wall -Wextra -fno-rtti \ 257 BASE_CXXFLAGS := -std=gnu++11 -Wall -Wextra -fno-rtti \
258 -fno-exceptions $(OPTLEVEL) $(ASSERTIONS) -g -pedantic \ 258 -fno-exceptions $(OPTLEVEL) $(ASSERTIONS) -g -pedantic \
259 $(LLVM_EXTRA_WARNINGS) $(CXX_EXTRA) -MP -MD 259 $(LLVM_EXTRA_WARNINGS) $(CXX_EXTRA) -MP -MD -Werror
260 260
261 ifdef WASM 261 ifdef WASM
262 # The WASM code inherits a lot of V8 code, which does not compile with
263 # -Werror.
264 BASE_CXXFLAGS := $(BASE_CXXFLAGS) $(V8_CXXFLAGS) -DALLOW_WASM=1 262 BASE_CXXFLAGS := $(BASE_CXXFLAGS) $(V8_CXXFLAGS) -DALLOW_WASM=1
265 OBJDIR := $(OBJDIR)+Wasm 263 OBJDIR := $(OBJDIR)+Wasm
266 else 264 else
267 BASE_CXXFLAGS := $(BASE_CXXFLAGS) -Werror -DALLOW_WASM=0 265 BASE_CXXFLAGS := $(BASE_CXXFLAGS) -DALLOW_WASM=0
268 endif 266 endif
269 267
270 CXXFLAGS := $(LLVM_CXXFLAGS) $(BASE_CXXFLAGS) $(CXX_DEFINES) $(HOST_FLAGS) \ 268 CXXFLAGS := $(LLVM_CXXFLAGS) $(BASE_CXXFLAGS) $(CXX_DEFINES) $(HOST_FLAGS) \
271 $(STDLIB_FLAGS) 269 $(STDLIB_FLAGS)
272 SB_CXXFLAGS := $(SB_LLVM_CXXFLAGS) $(BASE_CXXFLAGS) $(BASE_CXX_DEFINES) \ 270 SB_CXXFLAGS := $(SB_LLVM_CXXFLAGS) $(BASE_CXXFLAGS) $(BASE_CXX_DEFINES) \
273 -Wno-unknown-pragmas -I$(NACL_ROOT) -I$(NACL_ROOT)/.. 271 -Wno-unknown-pragmas -I$(NACL_ROOT) -I$(NACL_ROOT)/..
274 272
275 LDFLAGS := $(HOST_FLAGS) -L$(LIBCXX_INSTALL_PATH)/lib -Wl,--gc-sections \ 273 LDFLAGS := $(HOST_FLAGS) -L$(LIBCXX_INSTALL_PATH)/lib -Wl,--gc-sections \
276 $(LD_EXTRA) $(STDLIB_FLAGS) 274 $(LD_EXTRA) $(STDLIB_FLAGS)
277 # Not specifying -Wl,--gc-sections but instead doing bitcode linking GC w/ LTO. 275 # Not specifying -Wl,--gc-sections but instead doing bitcode linking GC w/ LTO.
(...skipping 494 matching lines...) Expand 10 before | Expand all | Expand 10 after
772 770
773 help-check-xtest: 771 help-check-xtest:
774 @cat Makefile.standalone-help/check-xtest.txt 772 @cat Makefile.standalone-help/check-xtest.txt
775 773
776 clean: 774 clean:
777 rm -rf pnacl-sz *.o $(foreach nexe,$(NEXES),$(notdir $(nexe))) \ 775 rm -rf pnacl-sz *.o $(foreach nexe,$(NEXES),$(notdir $(nexe))) \
778 $(OBJDIR) $(SB_OBJDIR) $(SBB_OBJDIR) build/*.bloat.json 776 $(OBJDIR) $(SB_OBJDIR) $(SBB_OBJDIR) build/*.bloat.json
779 777
780 clean-all: clean 778 clean-all: clean
781 rm -rf build/ crosstest/Output/ 779 rm -rf build/ crosstest/Output/
OLDNEW
« no previous file with comments | « .gitignore ('k') | README-wasm.md » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698