native_client_sdk/src/tools/common.mk - Issue 1163843006: [NaCl SDK] Use seperate build dir for msan/tsan 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: native_client_sdk/src/tools/common.mk

Issue 1163843006: [NaCl SDK] Use seperate build dir for msan/tsan builds (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 7 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 side-by-side diff with in-line comments

Download patch

Index: native_client_sdk/src/tools/common.mk

diff --git a/native_client_sdk/src/tools/common.mk b/native_client_sdk/src/tools/common.mk

index 114a4925652205591978d0008820f001fc19c83c..d23dc8f8ffe67fe9aad9172398312d3e4f2d8ef0 100644

--- a/native_client_sdk/src/tools/common.mk

+++ b/native_client_sdk/src/tools/common.mk

@@ -243,11 +243,18 @@ STANDALONE = 1

endif

OUTBASE ?= .

+CONFIG_DIR := $(CONFIG)

ifdef STANDALONE

-OUTDIR := $(OUTBASE)/$(TOOLCHAIN)/standalone_$(CONFIG)

-else

-OUTDIR := $(OUTBASE)/$(TOOLCHAIN)/$(CONFIG)

+CONFIG_DIR := standalone_$(CONFIG_DIR)

+endif

+ifdef MSAN

+CONFIG_DIR := msan_$(CONFIG_DIR)

endif

+ifdef TSAN

+CONFIG_DIR := tsan_$(CONFIG_DIR)

+endif

+OUTDIR := $(OUTBASE)/$(TOOLCHAIN)/$(CONFIG_DIR)

STAMPDIR ?= $(OUTDIR)

LIBDIR ?= $(NACL_SDK_ROOT)/lib

« no previous file with comments | « native_client_sdk/src/build_tools/test_sdk.py ('k') | native_client_sdk/src/tools/host_gcc.mk » ('j') | no next file with comments »