llvm.org GIT mirror llvm / 2c99ae8
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 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@317517 91177308-0d34-0410-b5e6-96231b3b80d8 Hans Wennborg 1 year, 11 months ago
1 changed file(s) with 1 addition(s) and 1 deletion(s). Raw diff Collapse all Expand all
156156 set(HAVE_TERMINFO 0)
157157 endif()
158158
159 find_library(ICONV_LIBRARY_PATH NAMES iconv libiconv libiconv-2)
159 find_library(ICONV_LIBRARY_PATH NAMES iconv libiconv libiconv-2 c)
160160 set(LLVM_LIBXML2_ENABLED 0)
161161 set(LIBXML2_FOUND 0)
162162 if((LLVM_ENABLE_LIBXML2) AND ((CMAKE_SYSTEM_NAME MATCHES "Linux") AND (ICONV_LIBRARY_PATH) OR APPLE))