summaryrefslogtreecommitdiff
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-01-24 16:10:39 +0000
commit3a018797531edc70fb31bd017d2d63780823fc32 (patch)
treeb0ac800047ed862db0e577f930db51f21b1bf148
parent0e8b83a0a8012e88a9b6f70f5a5a928f484d7097 (diff)
downloadqtwebengine-chromium-3a018797531edc70fb31bd017d2d63780823fc32.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>
-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 4ce58c7a860..6aca13e4fb9 100644
--- a/chromium/third_party/zlib/BUILD.gn
+++ b/chromium/third_party/zlib/BUILD.gn
@@ -70,7 +70,7 @@ config("zlib_arm_crc32_config") {
# - ChromeOS has wrapper scripts that are borking the compiler flags.
# - Fuchsia just added a syscall for feature detection.
# TODO(cavalcantii): crbug.com/810125.
- if (!is_ios && !is_chromeos && !is_fuchsia) {
+ if (is_clang && (!is_ios && !is_chromeos && !is_fuchsia)) {
defines = [ "CRC32_ARMV8_CRC32" ]
if (is_android) {
defines += [ "ARMV8_OS_ANDROID" ]