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

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

Issue 1810423002: [iOS/GN] Fix compilation of ios_chrome_unittests with gn. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@resources
Patch Set: Fix link error Created 4 years, 9 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
« no previous file with comments | « build/config/mac/BUILD.gn ('k') | components/autofill/ios/browser/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/toolchain/mac/BUILD.gn
diff --git a/build/toolchain/mac/BUILD.gn b/build/toolchain/mac/BUILD.gn
index 423de77e4d3e355c9514a6e6a07bd936f42b9479..d19829972d4125bc26972f6ab9fd282b06a6cde6 100644
--- a/build/toolchain/mac/BUILD.gn
+++ b/build/toolchain/mac/BUILD.gn
@@ -289,7 +289,6 @@ mac_toolchain("clang_arm") {
}
mac_toolchain("ios_clang_arm") {
- # TODO(GYP): Do we need ios_clang_armv7 and ios_clang_arm64 ?
toolchain_cpu = "arm"
toolchain_os = "mac"
@@ -303,6 +302,34 @@ mac_toolchain("ios_clang_arm") {
is_clang = true
}
+mac_toolchain("ios_clang_armv7") {
+ toolchain_cpu = "armv7"
+ 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("ios_clang_arm64") {
+ toolchain_cpu = "arm64"
+ 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"
« no previous file with comments | « build/config/mac/BUILD.gn ('k') | components/autofill/ios/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698