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

Meson: Remove FIXME about COCOA_LIBS and CARBON_LIBS

Browse Source 
They are already handled properly by osx_ldflags. As far as I can tell
it does the same as with autotools.

https://bugzilla.gnome.org/show_bug.cgi?id=784995
This commit is contained in:
Xavier Claessens 2018-05-15 14:57:32 -04:00
parent d0821da524
commit cf28bf1f11
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meson.build
View File

@ -618,7 +618,7 @@ glib_have_cocoa = cc.compiles('''#include <Cocoa/Cocoa.h>
if glib_have_cocoa if glib_have_cocoa
glib_conf.set('HAVE_COCOA', true) glib_conf.set('HAVE_COCOA', true)
osx_ldflags += '-Wl,-framework,Foundation -Wl,-framework,AppKit' osx_ldflags += ['-Wl,-framework,Foundation', '-Wl,-framework,AppKit']
endif endif
add_project_link_arguments(osx_ldflags, language : 'c') add_project_link_arguments(osx_ldflags, language : 'c')
@ -1765,9 +1765,7 @@ if libmount_dep.length() != 0
glib_conf.set('HAVE_LIBMOUNT', 1) glib_conf.set('HAVE_LIBMOUNT', 1)
endif endif
glib_conf.set('GIO_MODULE_DIR', glib_giomodulesdir) glib_conf.set('GIO_MODULE_DIR', glib_giomodulesdir)
# FIXME: Missing: # FIXME: Missing: @G_LIBS_EXTRA@ @GLIB_EXTRA_CFLAGS@ @G_MODULE_LDFLAGS@
# @COCOA_LIBS@ @CARBON_LIBS@ @G_LIBS_EXTRA@ @GLIB_EXTRA_CFLAGS@
# @G_MODULE_LDFLAGS@
# Tracing: dtrace # Tracing: dtrace
want_dtrace = get_option('dtrace') want_dtrace = get_option('dtrace')