Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(323)

Side by Side Diff: build/toolchain/mac/BUILD.gn

Issue 1720993002: Fix copy-paste-o. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # TODO(brettw) Use "gcc_toolchain.gni" like the Linux toolchains. This requires 5 # TODO(brettw) Use "gcc_toolchain.gni" like the Linux toolchains. This requires
6 # some enhancements since the commands on Mac are slightly different than on 6 # some enhancements since the commands on Mac are slightly different than on
7 # Linux. 7 # Linux.
8 8
9 import("../goma.gni") 9 import("../goma.gni")
10 import("//build/config/ios/ios_sdk.gni") 10 import("//build/config/ios/ios_sdk.gni")
11 11
12 assert(host_os == "mac") 12 assert(host_os == "mac")
13 13
14 import("//build/toolchain/goma.gni") 14 import("//build/toolchain/goma.gni")
15 import("//build/toolchain/toolchain.gni") 15 import("//build/toolchain/toolchain.gni")
16 16
17 if (use_goma) { 17 if (use_goma) {
18 goma_prefix = "$goma_dir/gomacc " 18 goma_prefix = "$goma_dir/gomacc "
19 } else { 19 } else {
20 goma_prefix = "" 20 goma_prefix = ""
21 } 21 }
22 22
23 # This will copy the gyp-mac-tool to the build directory. We pass in the source 23 # This will copy the gyp-mac-tool to the build directory. We pass in the source
24 # file of the win tool. 24 # file of the mac tool.
25 gyp_mac_tool_source = 25 gyp_mac_tool_source =
26 rebase_path("//tools/gyp/pylib/gyp/mac_tool.py", root_build_dir) 26 rebase_path("//tools/gyp/pylib/gyp/mac_tool.py", root_build_dir)
27 exec_script("setup_toolchain.py", [ gyp_mac_tool_source ]) 27 exec_script("setup_toolchain.py", [ gyp_mac_tool_source ])
28 28
29 # Shared toolchain definition. Invocations should set toolchain_os to set the 29 # Shared toolchain definition. Invocations should set toolchain_os to set the
30 # build args in this definition. 30 # build args in this definition.
31 template("mac_toolchain") { 31 template("mac_toolchain") {
32 toolchain(target_name) { 32 toolchain(target_name) {
33 assert(defined(invoker.cc), "mac_toolchain() must specify a \"cc\" value") 33 assert(defined(invoker.cc), "mac_toolchain() must specify a \"cc\" value")
34 assert(defined(invoker.cxx), "mac_toolchain() must specify a \"cxx\" value") 34 assert(defined(invoker.cxx), "mac_toolchain() must specify a \"cxx\" value")
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 } 295 }
296 296
297 mac_toolchain("x64") { 297 mac_toolchain("x64") {
298 toolchain_cpu = "x64" 298 toolchain_cpu = "x64"
299 toolchain_os = "mac" 299 toolchain_os = "mac"
300 cc = "${goma_prefix}/gcc" 300 cc = "${goma_prefix}/gcc"
301 cxx = "${goma_prefix}/g++" 301 cxx = "${goma_prefix}/g++"
302 ld = cxx 302 ld = cxx
303 is_clang = false 303 is_clang = false
304 } 304 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698