Chromium Code Reviews| Index: build/common.gypi |
| diff --git a/build/common.gypi b/build/common.gypi |
| index 110e195cbe1766182bf82fcbde68d850b58c0586..09cfee87f65f4cc4b01879db94089230e40a161f 100644 |
| --- a/build/common.gypi |
| +++ b/build/common.gypi |
| @@ -4903,6 +4903,10 @@ |
| '-D__compiler_offsetof=__builtin_offsetof', |
| '-Dnan=__builtin_nan', |
| ], |
| + 'cflags!': [ |
| + # Clang does not support the following options. |
| + '-finline-limit=64', |
| + ], |
| 'conditions': [ |
| ['target_arch=="arm"', { |
| 'cflags': [ |
| @@ -4914,10 +4918,10 @@ |
| }], |
| ['target_arch=="ia32"', { |
| 'cflags': [ |
| - '-target x86-linux-androideabi', |
| + '-target i686-linux-androideabi', |
|
Nico
2015/07/31 16:56:54
why this change?
Oliver Chang
2015/07/31 17:46:31
Clang doesn't seem to support "x86" as a target cp
|
| ], |
| 'ldflags': [ |
| - '-target x86-linux-androideabi', |
| + '-target i686-linux-androideabi', |
| ], |
| }], |
| # Place holder for x64 support, not tested. |