scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic_build.json - Issue 871603002: Reenable goma on OSX now that pnacl issues are fixed.

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: scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic_build.json

Issue 871603002: Reenable goma on OSX now that pnacl issues are fixed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build

Patch Set: Created 5 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: scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic_build.json

diff --git a/scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic_build.json b/scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic_build.json

index 8cf9788a1be9701f9326b5eda46d589f65d269bd..b2654036406e4729283859fd5c19f94c21f8048d 100644

--- a/scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic_build.json

+++ b/scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic_build.json

@@ -69,7 +69,7 @@

"runhooks"

"env": {

- "GYP_DEFINES": "clang=1 component=static_library dont_embed_build_metadata=1 target_arch=ia32"

+ "GYP_DEFINES": "clang=1 component=static_library dont_embed_build_metadata=1 gomadir='[BUILD]/goma' target_arch=ia32 use_goma=1"

"name": "gclient runhooks"

@@ -85,7 +85,9 @@

"--build-tool",

"ninja",

"--compiler",

- "clang",

+ "goma-clang",

+ "--goma-dir",

+ "[BUILD]/goma",

"--clobber",

"--",

"chromium_swarm_tests"

@@ -137,7 +139,9 @@