ports/nacl-spawn/Makefile - Issue 1555913002: Build gtest from source rather than using SDK-provided version

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: ports/nacl-spawn/Makefile

Issue 1555913002: Build gtest from source rather than using SDK-provided version (Closed) Base URL: https://chromium.googlesource.com/webports.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: ports/nacl-spawn/Makefile

diff --git a/ports/nacl-spawn/Makefile b/ports/nacl-spawn/Makefile

index 177c831cd17acb0138e969bb16da8b7222c2063a..7699871a64660dc9bd1b3f780a9f16121df3ddd9 100644

--- a/ports/nacl-spawn/Makefile

+++ b/ports/nacl-spawn/Makefile

@@ -12,6 +12,7 @@ LIBRARIES = libcli_main.a libnacl_spawn.a

CFLAGS += -std=gnu99

CPPFLAGS += -Wall -Werror -Iinclude

+CPPFLAGS += -I$(GTEST_DIR)/include

LDFLAGS += -lnacl_io

ifeq ($(NACL_SHARED),1)

@@ -48,13 +49,16 @@ libnacl_spawn.a: $(NACL_SPAWN_OBJS)

%.o: %.cc

$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@

+%.o: $(GTEST_DIR)/src/%.cc

+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@ -I$(GTEST_DIR)

# Targets for tests

LIBS=-Xlinker -uPSUserMainGet -lcli_main -lnacl_spawn

-LIBS+=-lgtest -lppapi_simple_cpp -lnacl_io -lppapi_cpp -lppapi

+LIBS+=-lppapi_simple_cpp -lnacl_io -lppapi_cpp -lppapi

-test/unittests: nacl_spawn_test.o $(LIBRARIES)

- $(CXX) -L. $(LDFLAGS) $< -o $@ $(LIBS)

+test/unittests: nacl_spawn_test.o $(LIBRARIES) gtest-all.o

+ $(CXX) -L. $(LDFLAGS) $< gtest-all.o -o $@ $(LIBS)

ifeq ($(TOOLCHAIN),glibc)

« no previous file with comments | « ports/mingn/build.sh ('k') | ports/nacl-spawn/build.sh » ('j') | no next file with comments »