native_client_sdk/src/tools/host_vc.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/host_vc.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/host_vc.mk

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

index 0890bc4be1b93b1aa5d2fc73797b175287010d10..9755c5541ffdeb04d1b1e9413a66e478a4764ab8 100644

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

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

@@ -77,7 +77,7 @@ $(STAMPDIR)/$(1).stamp: $(LIBDIR)/$(OSNAME)_x86_32_host/$(CONFIG)/$(1).lib

@echo "TOUCHED $$@" > $(STAMPDIR)/$(1).stamp

all:$(LIBDIR)/$(OSNAME)_x86_32_host/$(CONFIG)/$(1).lib

-$(LIBDIR)/$(OSNAME)_x86_32_host/$(CONFIG)/$(1).lib: $(foreach src,$(2),$(OUTDIR)/$(basename $(src)).o)

+$(LIBDIR)/$(OSNAME)_x86_32_host/$(CONFIG)/$(1).lib: $(foreach src,$(2),$(call SRC_TO_OBJ,$(src)))

$(MKDIR) -p $$(dir $$@)

$(call LOG,LIB,$$@,$(HOST_LIB) /OUT:$$@ $$^ $(WIN_LDFLAGS))

endef

@@ -111,7 +111,7 @@ endef

# $6 = VC Linker Switches

define LINK_RULE

-$(call LINKER_RULE,$(OUTDIR)/$(1)$(HOST_EXT),$(foreach src,$(2),$(OUTDIR)/$(basename $(src)).o),$(3),$(4),$(LIB_PATHS),$(6))

+$(call LINKER_RULE,$(OUTDIR)/$(1)$(HOST_EXT),$(foreach src,$(2),$(call SRC_TO_OBJ,$(src))),$(3),$(4),$(LIB_PATHS),$(6))

endef

« no previous file with comments | « native_client_sdk/src/tools/common.mk ('k') | no next file » | no next file with comments »