| Index: gypfiles/toolchain.gypi
|
| diff --git a/gypfiles/toolchain.gypi b/gypfiles/toolchain.gypi
|
| index 814d5657929c478b4d440e61b3b94a2017ebdeb1..a85c6607d0aeb73c7c8ff2be27814b406ca3507a 100644
|
| --- a/gypfiles/toolchain.gypi
|
| +++ b/gypfiles/toolchain.gypi
|
| @@ -107,7 +107,7 @@
|
| # are using a custom toolchain and need to control -B in ldflags.
|
| # Do not use 32-bit gold on 32-bit hosts as it runs out address space
|
| # for component=static_library builds.
|
| - ['OS=="linux" and (target_arch=="x64" or target_arch=="arm")', {
|
| + ['((OS=="linux" or OS=="android") and (target_arch=="x64" or target_arch=="arm" or (target_arch=="ia32" and host_arch=="x64"))) or (OS=="linux" and target_arch=="mipsel")', {
|
| 'linux_use_bundled_gold%': 1,
|
| }, {
|
| 'linux_use_bundled_gold%': 0,
|
|
|