Chromium Code Reviews| Index: third_party/libwebp/libwebp.gyp |
| diff --git a/third_party/libwebp/libwebp.gyp b/third_party/libwebp/libwebp.gyp |
| index 7174c1fbf6490d78958a9a04c39273be3dfc615f..947bd78b881b669a6f06abc9401a68682752f10c 100644 |
| --- a/third_party/libwebp/libwebp.gyp |
| +++ b/third_party/libwebp/libwebp.gyp |
| @@ -181,8 +181,9 @@ |
| 'cflags!': [ '-mfpu=vfpv3-d16' ], |
| 'cflags': [ '-mfpu=neon' ], |
| }], |
| - ['target_arch == "arm64"', { |
| + ['target_arch == "arm64" and OS == "android"', { |
|
jzern
2016/05/31 23:37:15
you should be able to check is_clang, not sure if
apatole
2016/06/01 05:25:41
OK, thanks for review, will check how it can be re
|
| # avoid an ICE with gcc-4.9: b/15574841 |
| + # Disable it for linux arm64 as clang build fails with error - unsupported flag. |
| 'cflags': [ '-frename-registers' ], |
| }], |
| ] |