| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 # IMPORTANT: | 5 # IMPORTANT: |
| 6 # Please don't directly include this file if you are building via gyp_chromium, | 6 # Please don't directly include this file if you are building via gyp_chromium, |
| 7 # since gyp_chromium is automatically forcing its inclusion. | 7 # since gyp_chromium is automatically forcing its inclusion. |
| 8 { | 8 { |
| 9 # Variables expected to be overriden on the GYP command line (-D) or by | 9 # Variables expected to be overriden on the GYP command line (-D) or by |
| 10 # ~/.gyp/include.gypi. | 10 # ~/.gyp/include.gypi. |
| (...skipping 4163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4174 '-Wl,--icf=none', | 4174 '-Wl,--icf=none', |
| 4175 ], | 4175 ], |
| 4176 }], | 4176 }], |
| 4177 ], | 4177 ], |
| 4178 }], | 4178 }], |
| 4179 # Newer gcc's support -fuse-ld, use the flag to force gold | 4179 # Newer gcc's support -fuse-ld, use the flag to force gold |
| 4180 # selection. | 4180 # selection. |
| 4181 # gcc -- http://gcc.gnu.org/onlinedocs/gcc-4.8.0/gcc/Optimize-Opti
ons.html | 4181 # gcc -- http://gcc.gnu.org/onlinedocs/gcc-4.8.0/gcc/Optimize-Opti
ons.html |
| 4182 # TODO(mithro): Watch for clang support at following thread: | 4182 # TODO(mithro): Watch for clang support at following thread: |
| 4183 # http://clang-developers.42468.n3.nabble.com/Adding-fuse-ld-suppo
rt-to-clang-td4032180.html | 4183 # http://clang-developers.42468.n3.nabble.com/Adding-fuse-ld-suppo
rt-to-clang-td4032180.html |
| 4184 ['gcc_version>=48', { | 4184 ['gcc_version>=48 and clang==0', { |
| 4185 'target_conditions': [ | 4185 'target_conditions': [ |
| 4186 ['_toolset=="target"', { | 4186 ['_toolset=="target"', { |
| 4187 'ldflags': [ | 4187 'ldflags': [ |
| 4188 '-fuse-ld=gold', | 4188 '-fuse-ld=gold', |
| 4189 ], | 4189 ], |
| 4190 }], | 4190 }], |
| 4191 ], | 4191 ], |
| 4192 }], | 4192 }], |
| 4193 ['host_gcc_version>=48', { | 4193 ['host_gcc_version>=48 and clang==0', { |
| 4194 'target_conditions': [ | 4194 'target_conditions': [ |
| 4195 ['_toolset=="host"', { | 4195 ['_toolset=="host"', { |
| 4196 'ldflags': [ | 4196 'ldflags': [ |
| 4197 '-fuse-ld=gold', | 4197 '-fuse-ld=gold', |
| 4198 ], | 4198 ], |
| 4199 }], | 4199 }], |
| 4200 ], | 4200 ], |
| 4201 }], | 4201 }], |
| 4202 ], | 4202 ], |
| 4203 }], | 4203 }], |
| (...skipping 17 matching lines...) Expand all Loading... |
| 4221 ['binutils_version>=223', { | 4221 ['binutils_version>=223', { |
| 4222 # Newer binutils don't set DT_RPATH unless you disable "new" dtags | 4222 # Newer binutils don't set DT_RPATH unless you disable "new" dtags |
| 4223 # and the new DT_RUNPATH doesn't work without --no-as-needed flag. | 4223 # and the new DT_RUNPATH doesn't work without --no-as-needed flag. |
| 4224 # FIXME(mithro): Figure out the --as-needed/--no-as-needed flags | 4224 # FIXME(mithro): Figure out the --as-needed/--no-as-needed flags |
| 4225 # inside this file to allow usage of --no-as-needed and removal of | 4225 # inside this file to allow usage of --no-as-needed and removal of |
| 4226 # this flag. | 4226 # this flag. |
| 4227 'ldflags': [ | 4227 'ldflags': [ |
| 4228 '-Wl,--disable-new-dtags', | 4228 '-Wl,--disable-new-dtags', |
| 4229 ], | 4229 ], |
| 4230 }], | 4230 }], |
| 4231 ['gcc_version>=48', { | 4231 ['gcc_version>=48 and clang==0', { |
| 4232 'target_conditions': [ | 4232 'target_conditions': [ |
| 4233 ['_toolset=="target"', { | 4233 ['_toolset=="target"', { |
| 4234 'cflags_cc': [ | 4234 'cflags_cc': [ |
| 4235 '-std=gnu++11', | 4235 '-std=gnu++11', |
| 4236 # See comment for -Wno-c++11-narrowing. | 4236 # See comment for -Wno-c++11-narrowing. |
| 4237 '-Wno-narrowing', | 4237 '-Wno-narrowing', |
| 4238 # TODO(thakis): Remove, http://crbug.com/263960 | 4238 # TODO(thakis): Remove, http://crbug.com/263960 |
| 4239 '-Wno-literal-suffix', | 4239 '-Wno-literal-suffix', |
| 4240 ], | 4240 ], |
| 4241 }], | 4241 }], |
| 4242 ], | 4242 ], |
| 4243 }], | 4243 }], |
| 4244 ['host_gcc_version>=48', { | 4244 ['host_gcc_version>=48 and clang==0', { |
| 4245 'target_conditions': [ | 4245 'target_conditions': [ |
| 4246 ['_toolset=="host"', { | 4246 ['_toolset=="host"', { |
| 4247 'cflags_cc': [ | 4247 'cflags_cc': [ |
| 4248 '-std=gnu++11', | 4248 '-std=gnu++11', |
| 4249 # See comment for -Wno-c++11-narrowing. | 4249 # See comment for -Wno-c++11-narrowing. |
| 4250 '-Wno-narrowing', | 4250 '-Wno-narrowing', |
| 4251 # TODO(thakis): Remove, http://crbug.com/263960 | 4251 # TODO(thakis): Remove, http://crbug.com/263960 |
| 4252 '-Wno-literal-suffix', | 4252 '-Wno-literal-suffix', |
| 4253 ], | 4253 ], |
| 4254 }], | 4254 }], |
| (...skipping 1213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5468 ['enable_new_npdevice_api==1', { | 5468 ['enable_new_npdevice_api==1', { |
| 5469 'target_defaults': { | 5469 'target_defaults': { |
| 5470 'defines': [ | 5470 'defines': [ |
| 5471 'ENABLE_NEW_NPDEVICE_API', | 5471 'ENABLE_NEW_NPDEVICE_API', |
| 5472 ], | 5472 ], |
| 5473 }, | 5473 }, |
| 5474 }], | 5474 }], |
| 5475 # Don't warn about the "typedef 'foo' locally defined but not used" | 5475 # Don't warn about the "typedef 'foo' locally defined but not used" |
| 5476 # for gcc 4.8. | 5476 # for gcc 4.8. |
| 5477 # TODO: remove this flag once all builds work. See crbug.com/227506 | 5477 # TODO: remove this flag once all builds work. See crbug.com/227506 |
| 5478 ['gcc_version>=48', { | 5478 ['gcc_version>=48 and clang==0', { |
| 5479 'target_defaults': { | 5479 'target_defaults': { |
| 5480 'cflags': [ | 5480 'cflags': [ |
| 5481 '-Wno-unused-local-typedefs', | 5481 '-Wno-unused-local-typedefs', |
| 5482 ], | 5482 ], |
| 5483 }, | 5483 }, |
| 5484 }], | 5484 }], |
| 5485 # We need a special case to handle the android webview build on mac because | 5485 # We need a special case to handle the android webview build on mac because |
| 5486 # the host gcc there doesn't accept this flag, but the target gcc may | 5486 # the host gcc there doesn't accept this flag, but the target gcc may |
| 5487 # require it. | 5487 # require it. |
| 5488 ['gcc_version>=48 and android_webview_build==1 and host_os=="mac"', { | 5488 ['gcc_version>=48 and android_webview_build==1 and host_os=="mac"', { |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5604 # settings in target dicts. SYMROOT is a special case, because many other | 5604 # settings in target dicts. SYMROOT is a special case, because many other |
| 5605 # Xcode variables depend on it, including variables such as | 5605 # Xcode variables depend on it, including variables such as |
| 5606 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 5606 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 5607 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5607 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 5608 # files to appear (when present) in the UI as actual files and not red | 5608 # files to appear (when present) in the UI as actual files and not red |
| 5609 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5609 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 5610 # and therefore SYMROOT, needs to be set at the project level. | 5610 # and therefore SYMROOT, needs to be set at the project level. |
| 5611 'SYMROOT': '<(DEPTH)/xcodebuild', | 5611 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 5612 }, | 5612 }, |
| 5613 } | 5613 } |
| OLD | NEW |