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

Side by Side Diff: Makefile

Issue 2338943003: Subzero: Fix SUBZERO_REVISION in production builds. (Closed)
Patch Set: Cleaner way of setting the working directory. Created 4 years, 3 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 | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 1
2 ifndef SUBZERO_LEVEL 2 ifndef SUBZERO_LEVEL
3 # Top-level, not included from a subdir 3 # Top-level, not included from a subdir
4 SUBZERO_LEVEL := . 4 SUBZERO_LEVEL := .
5 DIRS := src 5 DIRS := src
6 PARALLEL_DIRS := 6 PARALLEL_DIRS :=
7 endif 7 endif
8 8
9 # Set LLVM source root level. 9 # Set LLVM source root level.
10 LEVEL := $(SUBZERO_LEVEL)/../.. 10 LEVEL := $(SUBZERO_LEVEL)/../..
(...skipping 13 matching lines...) Expand all
24 -DALLOW_TIMERS=0 -DALLOW_LLVM_IR_AS_INPUT=0 -DALLOW_MINIMAL_BUILD=1 \ 24 -DALLOW_TIMERS=0 -DALLOW_LLVM_IR_AS_INPUT=0 -DALLOW_MINIMAL_BUILD=1 \
25 -DALLOW_WASM=0 -DPNACL_BROWSER_TRANSLATOR=1 25 -DALLOW_WASM=0 -DPNACL_BROWSER_TRANSLATOR=1
26 else 26 else
27 CPP.Defines += -DALLOW_DUMP=1 -DALLOW_LLVM_CL=1 -DALLOW_LLVM_IR=1 \ 27 CPP.Defines += -DALLOW_DUMP=1 -DALLOW_LLVM_CL=1 -DALLOW_LLVM_IR=1 \
28 -DALLOW_TIMERS=1 -DALLOW_LLVM_IR_AS_INPUT=1 -DALLOW_MINIMAL_BUILD=0 \ 28 -DALLOW_TIMERS=1 -DALLOW_LLVM_IR_AS_INPUT=1 -DALLOW_MINIMAL_BUILD=0 \
29 -DALLOW_WASM=0 -DPNACL_BROWSER_TRANSLATOR=0 29 -DALLOW_WASM=0 -DPNACL_BROWSER_TRANSLATOR=0
30 CXX.Flags += -Wno-undefined-var-template 30 CXX.Flags += -Wno-undefined-var-template
31 endif 31 endif
32 32
33 CPP.Defines += -DPNACL_LLVM 33 CPP.Defines += -DPNACL_LLVM
34 SZ_COMMIT_COUNT := $(shell git rev-list --count HEAD) 34 # SUBZERO_SRC_ROOT should already be set, but if not, set to cwd.
35 SZ_GIT_HASH := $(shell git rev-parse HEAD) 35 SUBZERO_SRC_ROOT ?= .
36 SZ_COMMIT_COUNT := $(shell git -C $(SUBZERO_SRC_ROOT) rev-list --count HEAD)
37 SZ_GIT_HASH := $(shell git -C $(SUBZERO_SRC_ROOT) rev-parse HEAD)
36 CPP.Defines += -DSUBZERO_REVISION=$(SZ_COMMIT_COUNT)_$(SZ_GIT_HASH) 38 CPP.Defines += -DSUBZERO_REVISION=$(SZ_COMMIT_COUNT)_$(SZ_GIT_HASH)
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698