diff options
| author |  Mike Klein <mtklein@chromium.org> | 2016-11-14 09:16:32 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-14 15:03:46 +0000 |
| commit | 4fea663af4f0d5dabb6e784072264abcbad29461 (patch) | |
| tree | 351841b0b2f16fb5348c833a5fbf4b5d1041bab7 /third_party/libjpeg-turbo | |
| parent | c168a3ac3cb96555011c73938f71f8183990ab46 (diff) | |
Apple's Clang can't assemble jsimd_arm_...
This should fix Build-Mac-Clang-arm64-Debug-GN_iOS_NoBuildbot.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4755
Change-Id: Ie49ce5642fb2d373102c9309074e13ee3035a569
Reviewed-on: https://skia-review.googlesource.com/4755
Reviewed-by: Matt Sarett <msarett@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'third_party/libjpeg-turbo')
| -rw-r--r-- | third_party/libjpeg-turbo/BUILD.gn | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/third_party/libjpeg-turbo/BUILD.gn b/third_party/libjpeg-turbo/BUILD.gn index 927df49a0e..6825b6bfee 100644 --- a/third_party/libjpeg-turbo/BUILD.gn +++ b/third_party/libjpeg-turbo/BUILD.gn @@ -64,12 +64,12 @@ if (skia_use_system_libjpeg_turbo) { "../externals/libjpeg-turbo/jutils.c", ] - if (current_cpu == "arm") { + if (current_cpu == "arm" && current_os != "ios") { sources += [ "../externals/libjpeg-turbo/simd/jsimd_arm.c", "../externals/libjpeg-turbo/simd/jsimd_arm_neon.S", ] - } else if (current_cpu == "arm64") { + } else if (current_cpu == "arm64" && current_os != "ios") { sources += [ "../externals/libjpeg-turbo/simd/jsimd_arm64.c", "../externals/libjpeg-turbo/simd/jsimd_arm64_neon.S", |