diff options
| author | Jo Shields <joshield@microsoft.com> | 2019-08-14 23:58:07 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-14 23:58:07 +0300 |
| commit | f2d813c90df3a6c4d15eab240b0a68ec055c8f5b (patch) | |
| tree | aef93bf4aed7610c2d0569e6d10e00dd19f442fc /llvm | |
| parent | a103b78163bc4a7c7852272e0a391557b9d32ff7 (diff) | |
Fix linking of OS-provided zlib (#16177)
* Fix linking of OS-provided zlib
This is a reduced version of https://github.com/mono/mono/pull/16091
without the Z_PREFIX stuff
* Get rid of HAVE_ZLIB, be explicit about HAVE_SYS_ZLIB vs HAVE_STATIC_ZLIB
* Proposed fixes from Alex
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/Makefile.am b/llvm/Makefile.am index e96a460c9ba..82c5e8454a1 100644 --- a/llvm/Makefile.am +++ b/llvm/Makefile.am @@ -12,7 +12,7 @@ endif if HAVE_STATIC_ZLIB llvm_extra_libs = $(STATIC_ZLIB_PATH) else -if HAVE_ZLIB +if HAVE_SYS_ZLIB llvm_extra_libs=-lz else llvm_extra_libs= |