| OLD | NEW |
| 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import("//build/config/android/config.gni") | 5 import("//build/config/android/config.gni") |
| 6 import("//build/config/chrome_build.gni") | 6 import("//build/config/chrome_build.gni") |
| 7 import("//build/config/chromecast_build.gni") | 7 import("//build/config/chromecast_build.gni") |
| 8 import("//build/config/compiler/compiler.gni") | 8 import("//build/config/compiler/compiler.gni") |
| 9 import("//build/toolchain/cc_wrapper.gni") | 9 import("//build/toolchain/cc_wrapper.gni") |
| 10 import("//build/toolchain/toolchain.gni") | 10 import("//build/toolchain/toolchain.gni") |
| (...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 160 if (is_win) { | 160 if (is_win) { |
| 161 configs += [ "//build/config/win:compiler" ] | 161 configs += [ "//build/config/win:compiler" ] |
| 162 } else if (is_android) { | 162 } else if (is_android) { |
| 163 configs += [ "//build/config/android:compiler" ] | 163 configs += [ "//build/config/android:compiler" ] |
| 164 } else if (is_linux) { | 164 } else if (is_linux) { |
| 165 configs += [ "//build/config/linux:compiler" ] | 165 configs += [ "//build/config/linux:compiler" ] |
| 166 } else if (is_nacl) { | 166 } else if (is_nacl) { |
| 167 configs += [ "//build/config/nacl:compiler" ] | 167 configs += [ "//build/config/nacl:compiler" ] |
| 168 } else if (is_mac) { | 168 } else if (is_mac) { |
| 169 configs += [ "//build/config/mac:compiler" ] | 169 configs += [ "//build/config/mac:compiler" ] |
| 170 } else if (is_fuchsia) { |
| 171 configs += [ "//build/config/fuchsia:compiler" ] |
| 170 } else if (is_ios) { | 172 } else if (is_ios) { |
| 171 configs += [ "//build/config/ios:compiler" ] | 173 configs += [ "//build/config/ios:compiler" ] |
| 172 } else if (is_fuchsia) { | 174 } else if (is_fuchsia) { |
| 173 configs += [ "//build/config/fuchsia:compiler" ] | 175 configs += [ "//build/config/fuchsia:compiler" ] |
| 174 } else if (current_os == "aix") { | 176 } else if (current_os == "aix") { |
| 175 configs += [ "//build/config/aix:compiler" ] | 177 configs += [ "//build/config/aix:compiler" ] |
| 176 } | 178 } |
| 177 | 179 |
| 178 # See the definitions below. | 180 # See the definitions below. |
| 179 configs += [ | 181 configs += [ |
| (...skipping 904 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1084 | 1086 |
| 1085 # TODO(thakis): This used to be implied by -Wno-unused-function, | 1087 # TODO(thakis): This used to be implied by -Wno-unused-function, |
| 1086 # which we no longer use. Check if it makes sense to remove | 1088 # which we no longer use. Check if it makes sense to remove |
| 1087 # this as well. http://crbug.com/316352 | 1089 # this as well. http://crbug.com/316352 |
| 1088 "-Wno-unneeded-internal-declaration", | 1090 "-Wno-unneeded-internal-declaration", |
| 1089 | 1091 |
| 1090 # TODO(hans): Get this cleaned up, http://crbug.com/428099 | 1092 # TODO(hans): Get this cleaned up, http://crbug.com/428099 |
| 1091 "-Wno-inconsistent-missing-override", | 1093 "-Wno-inconsistent-missing-override", |
| 1092 ] | 1094 ] |
| 1093 | 1095 |
| 1094 if (is_linux && target_cpu == "x86") { | 1096 if (is_linux && target_cpu == "x86" || is_fuchsia) { |
| 1095 cflags += [ | 1097 cflags += [ |
| 1096 # TODO(thakis): Remove from 32-bit Linux eventually, https://707084 | 1098 # TODO(thakis): Remove from 32-bit Linux eventually, https://707084 |
| 1097 "-Wno-deprecated-register", | 1099 "-Wno-deprecated-register", |
| 1098 ] | 1100 ] |
| 1099 } | 1101 } |
| 1100 | 1102 |
| 1101 # use_xcode_clang only refers to the iOS toolchain, host binaries use | 1103 # use_xcode_clang only refers to the iOS toolchain, host binaries use |
| 1102 # chromium's clang always. | 1104 # chromium's clang always. |
| 1103 if (!is_nacl && (!use_xcode_clang || current_toolchain == host_toolchain)) { | 1105 if (!is_nacl && (!use_xcode_clang || current_toolchain == host_toolchain)) { |
| 1104 # Flags NaCl (Clang 3.7) and Xcode 7.3 (Clang clang-703.0.31) do not | 1106 # Flags NaCl (Clang 3.7) and Xcode 7.3 (Clang clang-703.0.31) do not |
| (...skipping 647 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1752 | 1754 |
| 1753 if (is_ios || is_mac) { | 1755 if (is_ios || is_mac) { |
| 1754 # On Mac and iOS, this enables support for ARC (automatic ref-counting). | 1756 # On Mac and iOS, this enables support for ARC (automatic ref-counting). |
| 1755 # See http://clang.llvm.org/docs/AutomaticReferenceCounting.html. | 1757 # See http://clang.llvm.org/docs/AutomaticReferenceCounting.html. |
| 1756 config("enable_arc") { | 1758 config("enable_arc") { |
| 1757 common_flags = [ "-fobjc-arc" ] | 1759 common_flags = [ "-fobjc-arc" ] |
| 1758 cflags_objc = common_flags | 1760 cflags_objc = common_flags |
| 1759 cflags_objcc = common_flags | 1761 cflags_objcc = common_flags |
| 1760 } | 1762 } |
| 1761 } | 1763 } |
| OLD | NEW |