native_client_sdk/src/tools/common.mk - Issue 1559463002: [NaCl SDK] Don't include gtest/gmock in library form

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 1559463002: [NaCl SDK] Don't include gtest/gmock in library form (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 11 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 c3227985c1c9d84fd77bc5143a11d192e15bad25..f43ed63e5f1bedd7c772379c6ef90d6f2212bca7 100644

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

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

@@ -379,12 +379,16 @@ endif

# Convert a source path to a object file path.

+# If source path is absolute then just use the basename of for the object

+# file name (absolute sources paths with the same basename are not allowed).

+# For relative paths use the full path to the source in the object file path

+# name.

# $1 = Source Name

# $2 = Arch suffix

define SRC_TO_OBJ

-$(OUTDIR)/$(basename $(subst ..,__,$(1)))$(2).o

+$(if $(filter /%,$(1)), $(OUTDIR)/$(basename $(notdir $(1)))$(2).o, $(OUTDIR)/$(basename $(subst ..,__,$(1)))$(2).o)

endef

« no previous file with comments | « native_client_sdk/src/tests/sdk_util_test/example.dsc ('k') | native_client_sdk/src/tools/host_vc.mk » ('j') | no next file with comments »