luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-28 02:20:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-iconv-libc-macos' into 'glib-2-60'

Browse Source 
meson: Hotfix for iconv detection on macOS

See merge request GNOME/glib!775
This commit is contained in:
Philip Withnall 2019-04-11 14:37:56 +00:00
commit 44d7c68301
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
meson.build
View File

@ -1680,13 +1680,20 @@ glibconfig_conf.set10('G_HAVE_GROWING_STACK', growing_stack)
# We should never use the MinGW C library's iconv. On Windows we use the
# GNU implementation that ships with MinGW.
iconv_opt = get_option('iconv')
# On Darwin, the libc doesn't provide iconv. Instead, the OS provides libiconv
# as a separate (non-GNU) library. Set the option to 'native'.
if host_system == 'darwin' and iconv_opt == 'libc'
iconv_opt = 'native'
endif
# On Windows, just always use the built-in implementation
if host_system == 'windows'
libiconv = []
glib_conf.set('USE_LIBICONV_NATIVE', true)
else
found_iconv = false
iconv_opt = get_option('iconv')
if iconv_opt == 'libc'
if cc.has_function('iconv_open')
libiconv = []