| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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("config.gni") | 5 import("config.gni") |
| 6 if (is_clang) { | 6 if (is_clang) { |
| 7 import("//build/config/clang/clang.gni") | 7 import("//build/config/clang/clang.gni") |
| 8 } | 8 } |
| 9 if (is_posix) { |
| 10 import("//build/config/gcc/gcc_version.gni") |
| 11 } |
| 9 | 12 |
| 10 visibility = ["//sky/*"] | 13 visibility = ["//sky/*"] |
| 11 | 14 |
| 12 # features --------------------------------------------------------------------- | 15 # features --------------------------------------------------------------------- |
| 13 | 16 |
| 14 config("features") { | 17 config("features") { |
| 15 defines = feature_defines_list | 18 defines = feature_defines_list |
| 16 } | 19 } |
| 17 | 20 |
| 18 # inside_blink ----------------------------------------------------------------- | 21 # inside_blink ----------------------------------------------------------------- |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 # nullptr) conflict with upcoming c++0x types. | 60 # nullptr) conflict with upcoming c++0x types. |
| 58 cflags_cc = [ "-Wno-c++0x-compat" ] | 61 cflags_cc = [ "-Wno-c++0x-compat" ] |
| 59 } | 62 } |
| 60 | 63 |
| 61 if (is_linux && cpu_arch == "arm") { | 64 if (is_linux && cpu_arch == "arm") { |
| 62 # Due to a bug in gcc arm, we get warnings about uninitialized | 65 # Due to a bug in gcc arm, we get warnings about uninitialized |
| 63 # timesNewRoman.unstatic.3258 and colorTransparent.unstatic.4879. | 66 # timesNewRoman.unstatic.3258 and colorTransparent.unstatic.4879. |
| 64 cflags += [ "-Wno-uninitialized" ] | 67 cflags += [ "-Wno-uninitialized" ] |
| 65 } | 68 } |
| 66 | 69 |
| 70 if (is_posix && gcc_version >= 49) { |
| 71 cflags += [ "-Wno-unused-but-set-variable" ] |
| 72 } |
| 73 |
| 67 if (is_clang) { | 74 if (is_clang) { |
| 68 if (sky_gc_plugin && clang_use_chrome_plugins) { | 75 if (sky_gc_plugin && clang_use_chrome_plugins) { |
| 69 # TODO(GYP) | 76 # TODO(GYP) |
| 70 #'cflags': ['<!@(../../tools/clang/scripts/blink_gc_plugin_flags.sh enable
-oilpan=<(sky_enable_oilpan) dump-graph=<(sky_gc_plugin_dump_graph))'], | 77 #'cflags': ['<!@(../../tools/clang/scripts/blink_gc_plugin_flags.sh enable
-oilpan=<(sky_enable_oilpan) dump-graph=<(sky_gc_plugin_dump_graph))'], |
| 71 } | 78 } |
| 72 } | 79 } |
| 73 } | 80 } |
| 74 | 81 |
| 75 # The follow configs apply to all targets except for unit tests, which rely on | 82 # The follow configs apply to all targets except for unit tests, which rely on |
| 76 # static initializers. | 83 # static initializers. |
| 77 config("non_test_config") { | 84 config("non_test_config") { |
| 78 cflags = [] | 85 cflags = [] |
| 79 | 86 |
| 80 if (is_clang) { | 87 if (is_clang) { |
| 81 cflags += [ "-Wglobal-constructors" ] | 88 cflags += [ "-Wglobal-constructors" ] |
| 82 } | 89 } |
| 83 } | 90 } |
| OLD | NEW |