luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-10-28 18:16:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'kintel-iconv-macos' into 'main'

Browse Source 
Link with -framework Foundation and -framework AppKit to correctly link libiconv on macOS

Closes #3025

See merge request GNOME/glib!3483
This commit is contained in:
Philip Withnall 2023-06-29 09:45:08 +00:00
commit 9ef3ebc23c
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meson.build
View File

@ -866,6 +866,7 @@ if host_system == 'linux'
endif
endif
osx_ldflags = []
glib_have_os_x_9_or_later = false
glib_have_carbon = false
glib_have_cocoa = false
@ -898,6 +899,7 @@ if host_system == 'darwin'
if glib_have_cocoa
glib_conf.set('HAVE_COCOA', true)
osx_ldflags += ['-Wl,-framework,Foundation', '-Wl,-framework,AppKit']
endif
endif
@ -2119,7 +2121,7 @@ if libintl.found()
libintl_deps += [libintl]
else
libintl_iconv = cc.find_library('iconv', required : false)
if libintl_iconv.found() and cc.has_function('ngettext', dependencies : [libintl, libintl_iconv])
if libintl_iconv.found() and cc.has_function('ngettext', args : osx_ldflags, dependencies : [libintl, libintl_iconv])
libintl_deps += [libintl, libintl_iconv]
else
libintl_pthread = cc.find_library('pthread', required : false)