Chromium Code Reviews| Index: build/common.gypi |
| diff --git a/build/common.gypi b/build/common.gypi |
| index 1dc3dcd6d8bc7594c0e782b0dea0abc119a894d5..36a87f46b04d4a8b0362c3889e35d3343517f26e 100644 |
| --- a/build/common.gypi |
| +++ b/build/common.gypi |
| @@ -1308,15 +1308,12 @@ |
| ['OS=="android"', { |
| # We directly set the gcc_version since we know what we use. |
| '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)', |
| @@ -1333,6 +1330,12 @@ |
| }], |
| ['os_posix==1 and OS!="mac" and OS!="ios"', { |
| 'conditions': [ |
| + ['host_arch=="x64"', { |
| + 'binutils_directory%': 'third_party/binutils/x86_64-unknown-linux-gnu/bin', |
| + }], |
| + ['host_arch=="ia32"', { |
| + 'binutils_directory%': 'third_party/binutils/i686-pc-linux-gnu/bin', |
| + }], |
| ['target_arch=="mipsel"', { |
| 'werror%': '', |
| 'disable_nacl%': 1, |
| @@ -3050,6 +3053,7 @@ |
| 'Debug_Base': { |
| 'variables': { |
| 'debug_optimize%': '0', |
| + 'binutils_version%': '<!(python <(DEPTH)/build/compiler_version.py assembler)', |
|
mithro-old
2014/03/19 08:36:28
I think this line needs to have the -B from below
|
| }, |
| 'defines': [ |
| '_DEBUG', |
| @@ -3057,6 +3061,14 @@ |
| 'cflags': [ |
| '-O>(debug_optimize)', |
| '-g', |
| + '-B<!(cd <(DEPTH) && pwd -P)/<(binutils_directory)', |
| + ], |
| + 'ldflags': [ |
| + # Put our binutils in the search path. 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)/<(binutils_directory)', |
| ], |
| 'conditions' : [ |
| ['OS=="android"', { |
| @@ -3097,7 +3109,7 @@ |
| }], |
| # http://gcc.gnu.org/wiki/DebugFission |
| # Requires gold and gcc >= 4.7 or clang. |
| - ['linux_use_gold_flags==1 and (clang==1 or gcc_version>=47) and binutils_version>=223', { |
| + ['linux_use_gold_flags==1 and (clang==1 or gcc_version>=47)', { |
| 'cflags': ['-gsplit-dwarf'], |
| 'ldflags': ['-Wl,--gdb-index'], |
| }], |
| @@ -3732,7 +3744,7 @@ |
| # 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_directory)', |
| ], |
| }], |
| ], |