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

Unified Diff: build/config/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/arm.gni ('k') | build/toolchain/mac/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/mac/BUILD.gn
diff --git a/build/config/mac/BUILD.gn b/build/config/mac/BUILD.gn
index af1fbbc092b050f00ac80637df0d2ecc688ebd28..56e101cee713f3350170e5aeb007afe882bab157 100644
--- a/build/config/mac/BUILD.gn
+++ b/build/config/mac/BUILD.gn
@@ -24,16 +24,16 @@ config("compiler") {
"-arch",
"i386",
]
- } else if (current_cpu == "arm") {
- # TODO(GYP): we may need to distinguish between "arm64", "armv7",
- # and "armv7s" for iOS, and hence need multiple current_cpu values
- # rather than just "arm".
+ } else if (current_cpu == "armv7" || current_cpu == "arm") {
common_mac_flags += [
"-arch",
- "arm64",
- "-arch",
"armv7",
]
+ } else if (current_cpu == "arm64") {
+ common_mac_flags += [
+ "-arch",
+ "arm64",
+ ]
}
asmflags = common_mac_flags
« no previous file with comments | « build/config/arm.gni ('k') | build/toolchain/mac/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698