Makefile - Issue 2338943003: Subzero: Fix SUBZERO_REVISION in production builds.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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:

Index: Makefile

diff --git a/Makefile b/Makefile

index ca1d4e321cae285ef38e6eebbc97e73914f7fb11..65e459a9e105de539a6766fd60fde4cdf596ef4a 100644

--- a/Makefile

+++ b/Makefile

@@ -31,6 +31,8 @@ else

endif

CPP.Defines += -DPNACL_LLVM

-SZ_COMMIT_COUNT := $(shell git rev-list --count HEAD)

-SZ_GIT_HASH := $(shell git rev-parse HEAD)

+# SUBZERO_SRC_ROOT should already be set, but if not, set to cwd.

+SUBZERO_SRC_ROOT ?= .

+SZ_COMMIT_COUNT := $(shell git -C $(SUBZERO_SRC_ROOT) rev-list --count HEAD)

+SZ_GIT_HASH := $(shell git -C $(SUBZERO_SRC_ROOT) rev-parse HEAD)

CPP.Defines += -DSUBZERO_REVISION=$(SZ_COMMIT_COUNT)_$(SZ_GIT_HASH)

« no previous file with comments | « no previous file | no next file » | no next file with comments »