diff options
| author | Hans Wennborg <hans@hanshq.net> | 2017-11-06 22:17:23 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2017-11-06 22:17:23 +0000 |
| commit | effc12dd43c642a84ef9ebaf4c9c3721e5d2c07b (patch) | |
| tree | 516a75253b65dbf102dcc15886d18a1f0cd49b40 | |
| parent | 046833e5fbebe5f243820c664b58d74f0169ae37 (diff) | |
| download | llvm-effc12dd43c642a84ef9ebaf4c9c3721e5d2c07b.zip llvm-effc12dd43c642a84ef9ebaf4c9c3721e5d2c07b.tar.gz llvm-effc12dd43c642a84ef9ebaf4c9c3721e5d2c07b.tar.bz2 | |
Revert r316064 "Fix the incorrect detection of ICONV_LIBRARY_PATH"
This broke the use of libxml2 on machines where iconv() is provided by libc.
I'll follow up on the mailing list to discuss how to fix this properly.
> This is introduced in rL308711.
> Check for c library is incorrect here just because libc will be found always
> and it does not mean that iconv is presented.
>
> Thank to Andrew Krasny for narrowing down the root cause.
>
> Reviewers: ecbeckmann
> Reviewed By: ecbeckmann
> Subscribers: mgorny, llvm-commits
> Differential Revision: https://reviews.llvm.org/D38875
llvm-svn: 317517
| -rw-r--r-- | llvm/cmake/config-ix.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/cmake/config-ix.cmake b/llvm/cmake/config-ix.cmake index a1b4846..7f33591 100644 --- a/llvm/cmake/config-ix.cmake +++ b/llvm/cmake/config-ix.cmake @@ -157,7 +157,7 @@ if( NOT PURE_WINDOWS AND NOT LLVM_USE_SANITIZER MATCHES "Memory.*") set(HAVE_TERMINFO 0) endif() - find_library(ICONV_LIBRARY_PATH NAMES iconv libiconv libiconv-2) + find_library(ICONV_LIBRARY_PATH NAMES iconv libiconv libiconv-2 c) set(LLVM_LIBXML2_ENABLED 0) set(LIBXML2_FOUND 0) if((LLVM_ENABLE_LIBXML2) AND ((CMAKE_SYSTEM_NAME MATCHES "Linux") AND (ICONV_LIBRARY_PATH) OR APPLE)) |