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

Side by Side Diff: Makefile.standalone

Issue 1215463014: Modify how textual bitcode is injected into pnacl-sz. (Closed) Base URL: https://chromium.googlesource.com/native_client/pnacl-subzero.git@master
Patch Set: Fix issues in path set 3. Created 5 years, 5 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 | « Makefile ('k') | src/IceBuildDefs.h » ('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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 OBJDIR := $(OBJDIR)+Min 79 OBJDIR := $(OBJDIR)+Min
80 BASE_CXX_DEFINES += -DALLOW_DUMP=0 -DALLOW_LLVM_CL=0 -DALLOW_LLVM_IR=0 \ 80 BASE_CXX_DEFINES += -DALLOW_DUMP=0 -DALLOW_LLVM_CL=0 -DALLOW_LLVM_IR=0 \
81 -DALLOW_LLVM_IR_AS_INPUT=0 -DALLOW_DISABLE_IR_GEN=0 \ 81 -DALLOW_LLVM_IR_AS_INPUT=0 -DALLOW_DISABLE_IR_GEN=0 \
82 -DALLOW_MINIMAL_BUILD=1 82 -DALLOW_MINIMAL_BUILD=1
83 else 83 else
84 BASE_CXX_DEFINES += -DALLOW_DUMP=1 -DALLOW_LLVM_CL=1 -DALLOW_LLVM_IR=1 \ 84 BASE_CXX_DEFINES += -DALLOW_DUMP=1 -DALLOW_LLVM_CL=1 -DALLOW_LLVM_IR=1 \
85 -DALLOW_LLVM_IR_AS_INPUT=1 -DALLOW_DISABLE_IR_GEN=1 \ 85 -DALLOW_LLVM_IR_AS_INPUT=1 -DALLOW_DISABLE_IR_GEN=1 \
86 -DALLOW_MINIMAL_BUILD=0 86 -DALLOW_MINIMAL_BUILD=0
87 endif 87 endif
88 88
89 ifdef TEXTUAL_BITCODE
90 BASE_CXX_DEFINES += -DINPUT_IS_TEXTUAL_BITCODE=1
91 OBJDIR := $(OBJDIR)+Tbc
92 else
93 BASE_CXX_DEFINES += -DINPUT_IS_TEXTUAL_BITCODE=0
94 endif
95
96 SB_CXX_DEFINES := $(BASE_CXX_DEFINES) -DPNACL_BROWSER_TRANSLATOR=1 89 SB_CXX_DEFINES := $(BASE_CXX_DEFINES) -DPNACL_BROWSER_TRANSLATOR=1
97 CXX_DEFINES := $(BASE_CXX_DEFINES) -DPNACL_BROWSER_TRANSLATOR=0 90 CXX_DEFINES := $(BASE_CXX_DEFINES) -DPNACL_BROWSER_TRANSLATOR=0
98 91
99 ifdef NOASSERT 92 ifdef NOASSERT
100 ASSERTIONS = -DNDEBUG 93 ASSERTIONS = -DNDEBUG
101 else 94 else
102 ASSERTIONS = 95 ASSERTIONS =
103 OBJDIR := $(OBJDIR)+Asserts 96 OBJDIR := $(OBJDIR)+Asserts
104 endif 97 endif
105 98
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 224
232 ifdef TSAN 225 ifdef TSAN
233 sb: 226 sb:
234 @echo "Skipping pnacl-sz.*.nexe: TSAN isn't supported under NaCl." 227 @echo "Skipping pnacl-sz.*.nexe: TSAN isn't supported under NaCl."
235 else 228 else
236 sb: $(SB_OBJDIR)/pnacl-sz.x86-32.nexe 229 sb: $(SB_OBJDIR)/pnacl-sz.x86-32.nexe
237 endif 230 endif
238 231
239 # SHOW_BUILD_ATTS is an executable that is run to show what build 232 # SHOW_BUILD_ATTS is an executable that is run to show what build
240 # attributes were used to build pnacl-sz. 233 # attributes were used to build pnacl-sz.
241 ifdef TEXTUAL_BITCODE 234 SHOW_BUILD_ATTS = $(OBJDIR)/pnacl-sz --build-atts
242 SHOW_BUILD_ATTS = echo "Can't show build attributes when TEXTUAL_BITCODE=1"
243 else
244 SHOW_BUILD_ATTS = $(OBJDIR)/pnacl-sz --build-atts
245 endif
246 235
247 # Creates symbolic link so that testing is easier. Also runs 236 # Creates symbolic link so that testing is easier. Also runs
248 # pnacl-sz to verify that the defines flags have valid values, 237 # pnacl-sz to verify that the defines flags have valid values,
249 # as well as describe the corresponding build attributes. 238 # as well as describe the corresponding build attributes.
250 make_symlink: $(OBJDIR)/pnacl-sz 239 make_symlink: $(OBJDIR)/pnacl-sz
251 rm -rf pnacl-sz 240 rm -rf pnacl-sz
252 ln -s $(OBJDIR)/pnacl-sz 241 ln -s $(OBJDIR)/pnacl-sz
253 @echo "Build Attributes:" 242 @echo "Build Attributes:"
254 @$(SHOW_BUILD_ATTS) 243 @$(SHOW_BUILD_ATTS)
255 244
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
363 352
364 docs: 353 docs:
365 doxygen Doxyfile 354 doxygen Doxyfile
366 @echo See file://`pwd`/docs/html/index.html 355 @echo See file://`pwd`/docs/html/index.html
367 356
368 clean: 357 clean:
369 rm -rf pnacl-sz *.o $(OBJDIR) $(SB_OBJDIR) build/pnacl-sz.bloat.json 358 rm -rf pnacl-sz *.o $(OBJDIR) $(SB_OBJDIR) build/pnacl-sz.bloat.json
370 359
371 clean-all: clean 360 clean-all: clean
372 rm -rf build/ docs/ 361 rm -rf build/ docs/
OLDNEW
« no previous file with comments | « Makefile ('k') | src/IceBuildDefs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698