Chromium Code Reviews| Index: build/common.gypi |
| diff --git a/build/common.gypi b/build/common.gypi |
| index 68a4316b3c4bcfca9e46c1ed8e2f6f78e5f683b6..2e91b33463136ec98b6554311a02fd33ad1a1591 100644 |
| --- a/build/common.gypi |
| +++ b/build/common.gypi |
| @@ -1339,7 +1339,30 @@ |
| }, { |
| 'syzygy_optimize%': 0, |
| }], |
| - |
| + # Get binutils version so we can enable debug fission if we can. |
| + ['os_posix==1 and OS!="mac" and OS!="ios"', { |
| + 'binutils_version%': '<!(python <(DEPTH)/build/compiler_version.py assembler)', |
| + 'conditions': [ |
| + # On Android we know the binutils version in the toolchain. |
| + ['OS=="android"', { |
| + 'binutils_version%': 222, |
|
Lei Zhang
2014/04/03 23:00:01
In this case, since we already know, should this o
mithro-old
2014/04/04 03:36:28
Done.
|
| + }], |
| + # Our version of binutils in third_party/binutils |
| + ['linux_use_gold_binary==1', { |
| + 'binutils_version%': 224, |
| + 'conditions': [ |
| + ['host_arch=="x64"', { |
| + 'binutils_dir%': 'third_party/binutils/Linux_x64/Release', |
|
Lei Zhang
2014/04/03 23:00:01
Since there will always be a Release component in
mithro-old
2014/04/04 03:36:28
Done.
|
| + }], |
| + ['host_arch=="ia32"', { |
| + 'binutils_dir%': 'third_party/binutils/Linux_ia32/Release', |
| + }], |
| + ], |
| + }], |
| + ], |
| + }, { |
| + 'binutils_version%': 0, |
| + }], |
| # The version of GCC in use, set later in platforms that use GCC and have |
| # not explicitly chosen to build with clang. Currently, this means all |
| # platforms except Windows, Mac and iOS. |
| @@ -1356,15 +1379,12 @@ |
| 'gcc_version%': 46, |
| }], |
| ], |
| - 'binutils_version%': 222, |
| }, { |
| 'gcc_version%': '<!(python <(DEPTH)/build/compiler_version.py)', |
| - 'binutils_version%': '<!(python <(DEPTH)/build/compiler_version.py assembler)', |
| }], |
| ], |
| }, { |
| 'gcc_version%': 0, |
| - 'binutils_version%': 0, |
| }], |
| ['OS=="win" and "<!(python <(DEPTH)/build/dir_exists.py <(windows_sdk_default_path))"=="True"', { |
| 'windows_sdk_path%': '<(windows_sdk_default_path)', |
| @@ -3838,13 +3858,15 @@ |
| ], |
| }], |
| ['linux_use_gold_binary==1', { |
| + # Put our binutils, which contains gold in the search path. We pass |
| + # the path to gold to the compiler. gyp leaves unspecified what the |
| + # cwd is when running the compiler, so the normal gyp path-munging |
| + # fails us. This hack gets the right path. |
| + 'cflags': [ |
| + '-B<!(cd <(DEPTH) && pwd -P)/<(binutils_dir)/bin', |
| + ], |
| 'ldflags': [ |
| - # Put our gold binary in the search path for the linker. |
| - # We pass the path to gold to the compiler. gyp leaves |
| - # unspecified what the cwd is when running the compiler, |
| - # so the normal gyp path-munging fails us. This hack |
| - # gets the right path. |
| - '-B<!(cd <(DEPTH) && pwd -P)/third_party/gold', |
| + '-B<!(cd <(DEPTH) && pwd -P)/<(binutils_dir)/bin', |
| ], |
| }], |
| ], |