From 3a018797531edc70fb31bd017d2d63780823fc32 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 24 Jan 2019 16:36:29 +0100 Subject: 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 --- chromium/third_party/zlib/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" ] -- cgit v1.2.1