| OLD | NEW |
| 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/mac/mac_sdk.gni") | 10 import("//build/config/mac/mac_sdk.gni") |
| (...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 204 is_clang = invoker.is_clang | 204 is_clang = invoker.is_clang |
| 205 } | 205 } |
| 206 } | 206 } |
| 207 } | 207 } |
| 208 } | 208 } |
| 209 | 209 |
| 210 # Toolchain used for Mac host targets. | 210 # Toolchain used for Mac host targets. |
| 211 mac_toolchain("clang_x64") { | 211 mac_toolchain("clang_x64") { |
| 212 toolchain_cpu = "x64" | 212 toolchain_cpu = "x64" |
| 213 toolchain_os = "mac" | 213 toolchain_os = "mac" |
| 214 prefix = rebase_path("//third_party/llvm-build/Release+Asserts/bin", | 214 prefix = rebase_path("//buildtools/toolchain/clang+llvm-x86_64-darwin/bin", |
| 215 root_build_dir) | 215 root_build_dir) |
| 216 cc = "${goma_prefix}$prefix/clang" | 216 cc = "${goma_prefix}$prefix/clang" |
| 217 cxx = "${goma_prefix}$prefix/clang++" | 217 cxx = "${goma_prefix}$prefix/clang++" |
| 218 ld = cxx | 218 ld = cxx |
| 219 is_clang = true | 219 is_clang = true |
| 220 sysroot_flags = "-isysroot $mac_sdk_path -mmacosx-version-min=$mac_sdk_min" | 220 sysroot_flags = "-isysroot $mac_sdk_path -mmacosx-version-min=$mac_sdk_min" |
| 221 } | 221 } |
| 222 | 222 |
| 223 # Toolchain used for Mac host (i386) targets. | 223 # Toolchain used for Mac host (i386) targets. |
| 224 mac_toolchain("clang_i386") { | 224 mac_toolchain("clang_x86") { |
| 225 toolchain_cpu = "i386" | 225 toolchain_cpu = "i386" |
| 226 toolchain_os = "mac" | 226 toolchain_os = "mac" |
| 227 prefix = rebase_path("//third_party/llvm-build/Release+Asserts/bin", | 227 prefix = rebase_path("//buildtools/toolchain/clang+llvm-x86_64-darwin/bin", |
| 228 root_build_dir) | 228 root_build_dir) |
| 229 cc = "${goma_prefix}$prefix/clang" | 229 cc = "${goma_prefix}$prefix/clang" |
| 230 cxx = "${goma_prefix}$prefix/clang++" | 230 cxx = "${goma_prefix}$prefix/clang++" |
| 231 ld = cxx | 231 ld = cxx |
| 232 is_clang = true | 232 is_clang = true |
| 233 sysroot_flags = "-isysroot $mac_sdk_path -mmacosx-version-min=$mac_sdk_min" | 233 sysroot_flags = "-isysroot $mac_sdk_path -mmacosx-version-min=$mac_sdk_min" |
| 234 } | 234 } |
| OLD | NEW |