summaryrefslogtreecommitdiff
path: root/chromium/third_party/zlib
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-01-24 16:36:29 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-02-20 13:20:44 +0100
commit05ea1a8b935451bc0d7849036d7fb1cbe3a643cd (patch)
tree759ad1ddfdd6dee493fa42659ac0811d87840785 /chromium/third_party/zlib
parent1f0468891f67d10e1ee5434e3addbc4a3be68c85 (diff)
downloadqtwebengine-chromium-05ea1a8b935451bc0d7849036d7fb1cbe3a643cd.tar.gz
Fix building bundled zlib on non-clang
The check for adding the logic and for adding the sources didn't match. Change-Id: I843a8e24fbf666c8ce1340d1ae0d21fc5b66101a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/third_party/zlib')
-rw-r--r--chromium/third_party/zlib/BUILD.gn2
1 files changed, 1 insertions, 1 deletions
diff --git a/chromium/third_party/zlib/BUILD.gn b/chromium/third_party/zlib/BUILD.gn
index c1b3f563dac..458f428b7ce 100644
--- a/chromium/third_party/zlib/BUILD.gn
+++ b/chromium/third_party/zlib/BUILD.gn
@@ -74,7 +74,7 @@ if (use_arm_neon_optimizations) {
# implement the CRC32* instructions. These are optional in ARMv8.0."
# - Fuchsia just added a syscall for feature detection.
# TODO(cavalcantii): crbug.com/810125.
- if (!is_ios && !is_fuchsia) {
+ if (is_clang && (!is_ios && !is_fuchsia)) {
defines = [ "CRC32_ARMV8_CRC32" ]
if (is_android) {
defines += [ "ARMV8_OS_ANDROID" ]