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

Unified Diff: build/toolchain/mac/BUILD.gn

Issue 1250913002: patch from chinmaygarde@ to make progress on mac, ios. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: status Created 5 years, 4 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: build/toolchain/mac/BUILD.gn
diff --git a/build/toolchain/mac/BUILD.gn b/build/toolchain/mac/BUILD.gn
index 237f6416cbf5ab7198259ec02ddb1c5ca28713cc..7f63f6f15ca49d36575a2729601507349a313f5f 100644
--- a/build/toolchain/mac/BUILD.gn
+++ b/build/toolchain/mac/BUILD.gn
@@ -7,6 +7,7 @@
# Linux.
import("../goma.gni")
+import("//build/config/ios/ios_sdk.gni")
assert(host_os == "mac")
@@ -81,7 +82,7 @@ template("mac_toolchain") {
tool("objc") {
depfile = "{{output}}.d"
- command = "$cxx -MMD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_objc}} -c {{source}} -o {{output}}"
+ command = "$cxx -MMD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_c}} {{cflags_objc}} -c {{source}} -o {{output}}"
depsformat = "gcc"
description = "OBJC {{output}}"
outputs = [
@@ -91,7 +92,7 @@ template("mac_toolchain") {
tool("objcxx") {
depfile = "{{output}}.d"
- command = "$cxx -MMD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_objcc}} -c {{source}} -o {{output}}"
+ command = "$cxx -MMD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_cc}} {{cflags_objcc}} -c {{source}} -o {{output}}"
depsformat = "gcc"
description = "OBJCXX {{output}}"
outputs = [
@@ -204,6 +205,21 @@ mac_toolchain("clang_arm") {
is_clang = true
}
+mac_toolchain("ios_clang_arm") {
+ # TODO(GYP): Do we need ios_clang_armv7 and ios_clang_arm64 ?
+ toolchain_cpu = "arm"
+ toolchain_os = "mac"
+
+ # TODO(GYP): We need to support being able to use the version of clang
+ # shipped w/ XCode instead of the one pulled from upstream.
+ prefix = rebase_path("//third_party/llvm-build/Release+Asserts/bin",
+ root_build_dir)
+ cc = "${goma_prefix}$prefix/clang"
+ cxx = "${goma_prefix}$prefix/clang++"
+ ld = cxx
+ is_clang = true
+}
+
mac_toolchain("arm") {
toolchain_cpu = "arm"
toolchain_os = "mac"
« base/BUILD.gn ('K') | « build/secondary/third_party/nss/BUILD.gn ('k') | testing/test.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698