diff options
| author | Tom Anderson <thomasanderson@chromium.org> | 2018-03-14 20:11:42 +0000 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2018-03-14 20:11:42 +0000 |
| commit | 8c371ad77b836c02e44006dc2dc77c5d6d910861 (patch) | |
| tree | 1ec0968722cf1713a445ff025bfbf6a249aba47d /google | |
| parent | f38d8efadd09d53331cbba0e76128b476360fc42 (diff) | |
| download | zlib-8c371ad77b836c02e44006dc2dc77c5d6d910861.tar.gz | |
Fix build with unbundled zlib
Linux distros like Gentoo have a philosophy of not statically-linking
dependencies. The reason is not necessarily to save disk space, but
because they like to compile with their own flags and patches applied.
This CL fixes the zlib unbundle for them.
BUG=800977
Change-Id: I129d95a5a4b6c4183666f712609b2e3f0509526e
Reviewed-on: https://chromium-review.googlesource.com/947464
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: Chris Blume <cblume@chromium.org>
Reviewed-by: Adenilson Cavalcanti <cavalcantii@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#543178}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 03910003604f13b0b9cae179991ff722df261aa3
Diffstat (limited to 'google')
| -rw-r--r-- | google/compression_utils.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/google/compression_utils.cc b/google/compression_utils.cc index 477f97f..e7be1e9 100644 --- a/google/compression_utils.cc +++ b/google/compression_utils.cc @@ -13,7 +13,12 @@ #include "base/bit_cast.h" #include "base/logging.h" #include "base/sys_byteorder.h" + +#if defined(USE_SYSTEM_ZLIB) +#include <zlib.h> +#else #include "third_party/zlib/zlib.h" +#endif namespace { |