Chromium Code Reviews| Index: build/config/BUILDCONFIG.gn |
| diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn |
| index 38da66cef0ffbafed63f5dde29eb0adb68fb0989..4c1e9592f53c36cabd496b2cad796a180074e997 100644 |
| --- a/build/config/BUILDCONFIG.gn |
| +++ b/build/config/BUILDCONFIG.gn |
| @@ -80,6 +80,11 @@ declare_args() { |
| # When running in gyp-generating mode, this is the root of the build tree. |
| gyp_output_dir = "out" |
| + |
| + # When running in gyp-generating mode, this flag indicates if the current GYP |
| + # generator is xcode.On Mac, you can assume if this is false that the |
|
Nico
2014/01/29 18:34:19
Nit: missing space after '.', and I'd probably jus
|
| + # generator is Ninja. |
| + is_gyp_xcode_generator = false |
| } |
| # ============================================================================= |
| @@ -161,9 +166,8 @@ if (os == "win") { |
| is_nacl = false |
| is_posix = true |
| is_win = false |
| - if (!is_clang) { |
| + if (!is_gyp_xcode_generator) { |
| # Always use clang on iOS when using ninja |
| - # (which is always true when using GN). |
| is_clang = true |
| } |
| } else if (os == "linux") { |
| @@ -332,10 +336,13 @@ native_compiler_configs = [ |
| "//build/config/compiler:runtime_library", |
| ] |
| if (is_win) { |
| - native_compiler_configs += [ |
| - "//build/config/win:sdk", |
| - ] |
| -} else if (is_clang) { |
| + native_compiler_configs += [ "//build/config/win:sdk", ] |
| +} else if (is_mac) { |
| + native_compiler_configs += [ "//build/config/mac:sdk", ] |
| +} else if (is_ios) { |
| + native_compiler_configs += [ "//build/config/ios:sdk", ] |
| +} |
| +if (is_clang) { |
| native_compiler_configs += [ "//build/config/clang:find_bad_constructs" ] |
| } |