diff options
| author | Saleem Abdulrasool <compnerd@compnerd.org> | 2020-01-01 15:01:04 -0800 |
|---|---|---|
| committer | Saleem Abdulrasool <abdulras@google.com> | 2020-01-02 11:19:12 -0800 |
| commit | abb00753069554c538f3d850897373d093389945 (patch) | |
| tree | b5956bbf7c2936bba6e6a154aba32893942f3eec /lld/test/lit.site.cfg.py.in | |
| parent | aa17d31edb00c66461093b5a7cd2f4a35dc143e9 (diff) | |
| download | llvm-abb00753069554c538f3d850897373d093389945.zip llvm-abb00753069554c538f3d850897373d093389945.tar.gz llvm-abb00753069554c538f3d850897373d093389945.tar.bz2 | |
build: reduce CMake handling for zlib
Rather than handling zlib handling manually, use `find_package` from CMake
to find zlib properly. Use this to normalize the `LLVM_ENABLE_ZLIB`,
`HAVE_ZLIB`, `HAVE_ZLIB_H`. Furthermore, require zlib if `LLVM_ENABLE_ZLIB` is
set to `YES`, which requires the distributor to explicitly select whether
zlib is enabled or not. This simplifies the CMake handling and usage in
the rest of the tooling.
This restores 68a235d07f9e7049c7eb0c8091f37e385327ac28,
e6c7ed6d2164a0659fd9f6ee44f1375d301e3cad. The problem with the windows
bot is a need for clearing the cache.
Diffstat (limited to 'lld/test/lit.site.cfg.py.in')
| -rw-r--r-- | lld/test/lit.site.cfg.py.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lld/test/lit.site.cfg.py.in b/lld/test/lit.site.cfg.py.in index 02840f8..531fce1 100644 --- a/lld/test/lit.site.cfg.py.in +++ b/lld/test/lit.site.cfg.py.in @@ -14,7 +14,7 @@ config.lld_libs_dir = "@LLVM_LIBRARY_OUTPUT_INTDIR@" config.lld_tools_dir = "@LLVM_RUNTIME_OUTPUT_INTDIR@" config.target_triple = "@TARGET_TRIPLE@" config.python_executable = "@PYTHON_EXECUTABLE@" -config.have_zlib = @HAVE_LIBZ@ +config.have_zlib = @LLVM_ENABLE_ZLIB@ config.sizeof_void_p = @CMAKE_SIZEOF_VOID_P@ # Support substitution of the tools and libs dirs with user parameters. This is |