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

Unified Diff: build/config/compiler/BUILD.gn

Issue 1130153009: Update build configuration to support iOS targets (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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/config/ios/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/compiler/BUILD.gn
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 0e28e7da8be6dce3e5b5d93500416c894b8513cd..18176e2c9b4bcec70bd5ad9129916a86918df386 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -125,7 +125,7 @@ config("compiler") {
}
# Linker warnings.
- if (!(is_chromeos && current_cpu == "arm") && !is_mac) {
+ if (!(is_chromeos && current_cpu == "arm") && !is_mac && !is_ios) {
# TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580
ldflags += [ "-Wl,--fatal-warnings" ]
}
@@ -186,6 +186,11 @@ config("compiler") {
"-arch",
"i386",
]
+ } else if (current_cpu == "arm") {
+ common_mac_flags += [
+ "-arch",
+ "armv7",
+ ]
}
cflags += common_mac_flags
@@ -493,7 +498,7 @@ config("compiler") {
}
config("compiler_arm_fpu") {
- if (current_cpu == "arm") {
+ if (current_cpu == "arm" && !is_ios) {
cflags = [ "-mfpu=$arm_fpu" ]
}
}
« no previous file with comments | « build/config/arm.gni ('k') | build/config/ios/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698