Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index e12f47460988726529875e8f7e1bb35701a61552..925417607a4c158838ecad109e2fb5754f78c23a 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -4539,11 +4539,16 @@ |
'-B<!(cd <(DEPTH) && pwd -P)/<(binutils_dir)', |
], |
}], |
- ['linux_use_bundled_gold==1', { |
+ ['linux_use_bundled_gold==1 and \ |
+ not (clang==0 and (use_lto==1 or use_lto_o2==1))', { |
Nico
2015/04/16 19:17:12
I think the python style guide prefers
'abc'
pcc
2015/04/16 19:45:15
Done.
|
# 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. |
+ # |
+ # Disabled when using GCC LTO because GCC also uses the -B search |
+ # path at link time to find "as", and our bundled "as" can only |
+ # target x86. |
'ldflags': [ |
'-B<!(cd <(DEPTH) && pwd -P)/<(binutils_dir)', |
], |