| 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" ]
|
| }
|
| }
|
|
|