Chromium Code Reviews| 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 3875 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3886 }], | 3886 }], |
| 3887 ['linux_use_bundled_gold==1', { | 3887 ['linux_use_bundled_gold==1', { |
| 3888 # Put our binutils, which contains gold in the search path. We pass | 3888 # Put our binutils, which contains gold in the search path. We pass |
| 3889 # the path to gold to the compiler. gyp leaves unspecified what the | 3889 # the path to gold to the compiler. gyp leaves unspecified what the |
| 3890 # cwd is when running the compiler, so the normal gyp path-munging | 3890 # cwd is when running the compiler, so the normal gyp path-munging |
| 3891 # fails us. This hack gets the right path. | 3891 # fails us. This hack gets the right path. |
| 3892 'ldflags': [ | 3892 'ldflags': [ |
| 3893 '-B<!(cd <(DEPTH) && pwd -P)/<(binutils_dir)', | 3893 '-B<!(cd <(DEPTH) && pwd -P)/<(binutils_dir)', |
| 3894 ], | 3894 ], |
| 3895 }], | 3895 }], |
| 3896 ['binutils_version>=224', { | 3896 ['binutils_version>=223', { |
|
dshwang
2014/04/23 15:23:45
I'm not sure if 222 works also. Anyway, 223 work w
Lei Zhang
2014/04/23 18:14:09
I'm worried older 2.23 releases didn't have new-dt
dshwang
2014/04/23 20:05:23
Thank you for review.
I think omitting --disable-n
dshwang
2014/04/23 20:14:53
Ah, my previous comment does not make sense.
The
| |
| 3897 # Newer binutils don't set DT_RPATH unless you disable "new" dtags | 3897 # Newer binutils don't set DT_RPATH unless you disable "new" dtags |
| 3898 # and the new DT_RUNPATH doesn't work without --no-as-needed flag. | 3898 # and the new DT_RUNPATH doesn't work without --no-as-needed flag. |
| 3899 # FIXME(mithro): Figure out the --as-needed/--no-as-needed flags | 3899 # FIXME(mithro): Figure out the --as-needed/--no-as-needed flags |
| 3900 # inside this file to allow usage of --no-as-needed and removal of | 3900 # inside this file to allow usage of --no-as-needed and removal of |
| 3901 # this flag. | 3901 # this flag. |
| 3902 'ldflags': [ | 3902 'ldflags': [ |
| 3903 '-Wl,--disable-new-dtags', | 3903 '-Wl,--disable-new-dtags', |
| 3904 ], | 3904 ], |
| 3905 }] | 3905 }] |
| 3906 ], | 3906 ], |
| (...skipping 1313 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 5220 # settings in target dicts. SYMROOT is a special case, because many other | 5220 # settings in target dicts. SYMROOT is a special case, because many other |
| 5221 # Xcode variables depend on it, including variables such as | 5221 # Xcode variables depend on it, including variables such as |
| 5222 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 5222 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 5223 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5223 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 5224 # files to appear (when present) in the UI as actual files and not red | 5224 # files to appear (when present) in the UI as actual files and not red |
| 5225 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5225 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 5226 # and therefore SYMROOT, needs to be set at the project level. | 5226 # and therefore SYMROOT, needs to be set at the project level. |
| 5227 'SYMROOT': '<(DEPTH)/xcodebuild', | 5227 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 5228 }, | 5228 }, |
| 5229 } | 5229 } |
| OLD | NEW |