build/toolchain/mac/BUILD.gn - Issue 164773005: Pull GN @ 252040, update calls

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: build/toolchain/mac/BUILD.gn

Issue 164773005: Pull GN @ 252040, update calls (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: long line Created 6 years, 10 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:

Index: build/toolchain/mac/BUILD.gn

diff --git a/build/toolchain/mac/BUILD.gn b/build/toolchain/mac/BUILD.gn

index afd09e0a45f05e2b00e9fef88d67a2f8c04dfcab..35f80b02824640809fde9fdd985232d73b02adb9 100644

--- a/build/toolchain/mac/BUILD.gn

+++ b/build/toolchain/mac/BUILD.gn

@@ -15,8 +15,10 @@ import("//build/toolchain/clang.gni")

import("//build/toolchain/goma.gni")

if (is_clang) {

- cc = rebase_path("//third_party/llvm-build/Release+Asserts/bin/clang", ".", root_build_dir)

- cxx = rebase_path("//third_party/llvm-build/Release+Asserts/bin/clang++", ".", root_build_dir)

+ cc = rebase_path("//third_party/llvm-build/Release+Asserts/bin/clang",

+ root_build_dir)

+ cxx = rebase_path("//third_party/llvm-build/Release+Asserts/bin/clang++",

+ root_build_dir)

# Set the GYP header for all toolchains when running under Clang.

if (is_gyp) {

@@ -50,7 +52,7 @@ ld = cxx

# This will copy the gyp-mac-tool to the build directory. We pass in the source

# file of the win tool.

gyp_mac_tool_source =

- rebase_path("//tools/gyp/pylib/gyp/mac_tool.py", ".", root_build_dir)

+ rebase_path("//tools/gyp/pylib/gyp/mac_tool.py", root_build_dir)

exec_script("setup_toolchain.py", [ gyp_mac_tool_source ], "value")

# Shared toolchain definition. Invocations should set toolchain_os to set the

« no previous file with comments | « build/toolchain/linux/BUILD.gn ('k') | build/toolchain/win/BUILD.gn » ('j') | no next file with comments »