mirror of
https://github.com/python/cpython.git
synced 2025-09-02 23:18:25 +00:00
That fix was bogus, undone. The problem is that the iconv include file
is found if you are running fink, but the module doesn't work. For now I disabled building iconv_codec on darwin.
This commit is contained in:
parent
70ec40befa
commit
9ce623fce5
1 changed files with 3 additions and 3 deletions
6
setup.py
6
setup.py
|
@ -621,9 +621,9 @@ class PyBuildExt(build_ext):
|
||||||
['/usr/local/include', '/usr/pkg/include'])
|
['/usr/local/include', '/usr/pkg/include'])
|
||||||
iconv_libs = find_library_file(self.compiler, 'iconv', lib_dirs,
|
iconv_libs = find_library_file(self.compiler, 'iconv', lib_dirs,
|
||||||
['/usr/local/lib', '/usr/pkg/lib'])
|
['/usr/local/lib', '/usr/pkg/lib'])
|
||||||
|
|
||||||
if iconv_incs:
|
if platform not in ['darwin'] and iconv_incs is not None:
|
||||||
if iconv_libs:
|
if iconv_libs is not None:
|
||||||
iconv_libraries = ['iconv']
|
iconv_libraries = ['iconv']
|
||||||
else:
|
else:
|
||||||
iconv_libraries = [] # in libc
|
iconv_libraries = [] # in libc
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue