| 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 4224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4235 ['binutils_version>=223', { | 4235 ['binutils_version>=223', { |
| 4236 # Newer binutils don't set DT_RPATH unless you disable "new" dtags | 4236 # Newer binutils don't set DT_RPATH unless you disable "new" dtags |
| 4237 # and the new DT_RUNPATH doesn't work without --no-as-needed flag. | 4237 # and the new DT_RUNPATH doesn't work without --no-as-needed flag. |
| 4238 # FIXME(mithro): Figure out the --as-needed/--no-as-needed flags | 4238 # FIXME(mithro): Figure out the --as-needed/--no-as-needed flags |
| 4239 # inside this file to allow usage of --no-as-needed and removal of | 4239 # inside this file to allow usage of --no-as-needed and removal of |
| 4240 # this flag. | 4240 # this flag. |
| 4241 'ldflags': [ | 4241 'ldflags': [ |
| 4242 '-Wl,--disable-new-dtags', | 4242 '-Wl,--disable-new-dtags', |
| 4243 ], | 4243 ], |
| 4244 }], | 4244 }], |
| 4245 ['gcc_version>=48 and clang==0', { | 4245 ['gcc_version>=47 and clang==0', { |
| 4246 'target_conditions': [ | 4246 'target_conditions': [ |
| 4247 ['_toolset=="target"', { | 4247 ['_toolset=="target"', { |
| 4248 'cflags_cc': [ | 4248 'cflags_cc': [ |
| 4249 '-std=gnu++11', | 4249 '-std=gnu++11', |
| 4250 # See comment for -Wno-c++11-narrowing. | 4250 # See comment for -Wno-c++11-narrowing. |
| 4251 '-Wno-narrowing', | 4251 '-Wno-narrowing', |
| 4252 # TODO(thakis): Remove, http://crbug.com/263960 | 4252 # TODO(thakis): Remove, http://crbug.com/263960 |
| 4253 '-Wno-literal-suffix', | 4253 '-Wno-literal-suffix', |
| 4254 ], | 4254 ], |
| 4255 }], | 4255 }], |
| 4256 ], | 4256 ], |
| 4257 }], | 4257 }], |
| 4258 ['host_gcc_version>=48 and clang==0', { | 4258 ['host_gcc_version>=47 and clang==0', { |
| 4259 'target_conditions': [ | 4259 'target_conditions': [ |
| 4260 ['_toolset=="host"', { | 4260 ['_toolset=="host"', { |
| 4261 'cflags_cc': [ | 4261 'cflags_cc': [ |
| 4262 '-std=gnu++11', | 4262 '-std=gnu++11', |
| 4263 # See comment for -Wno-c++11-narrowing. | 4263 # See comment for -Wno-c++11-narrowing. |
| 4264 '-Wno-narrowing', | 4264 '-Wno-narrowing', |
| 4265 # TODO(thakis): Remove, http://crbug.com/263960 | 4265 # TODO(thakis): Remove, http://crbug.com/263960 |
| 4266 '-Wno-literal-suffix', | 4266 '-Wno-literal-suffix', |
| 4267 ], | 4267 ], |
| 4268 }], | 4268 }], |
| (...skipping 1403 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5672 # settings in target dicts. SYMROOT is a special case, because many other | 5672 # settings in target dicts. SYMROOT is a special case, because many other |
| 5673 # Xcode variables depend on it, including variables such as | 5673 # Xcode variables depend on it, including variables such as |
| 5674 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 5674 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 5675 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5675 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 5676 # files to appear (when present) in the UI as actual files and not red | 5676 # files to appear (when present) in the UI as actual files and not red |
| 5677 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5677 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 5678 # and therefore SYMROOT, needs to be set at the project level. | 5678 # and therefore SYMROOT, needs to be set at the project level. |
| 5679 'SYMROOT': '<(DEPTH)/xcodebuild', | 5679 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 5680 }, | 5680 }, |
| 5681 } | 5681 } |
| OLD | NEW |