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..14bc2f67e82f9de9ebf1d5549787b304a88c7749 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 not (OS == "linux" and clang == 1)', { |
|
Nico
2016/06/02 17:57:24
I think you can just add `and clang!=1` here. You
apatole
2016/06/03 06:11:47
OK, will do.
apatole
2016/06/03 11:33:44
Done.
|
| # avoid an ICE with gcc-4.9: b/15574841 |
| + # Disable it for clang build of linux arm64 as it fails with error - unsupported flag. |
| 'cflags': [ '-frename-registers' ], |
| }], |
| ] |