[glib] Meson: Remove FIXME about COCOA_LIBS and CARBON_LIBS



commit cf28bf1f11e40886e7fa196857107dc4df2d1116
Author: Xavier Claessens <xavier claessens collabora com>
Date:   Tue May 15 14:57:32 2018 -0400

    Meson: Remove FIXME about COCOA_LIBS and CARBON_LIBS
    
    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

 meson.build | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/meson.build b/meson.build
index 7f017e613..f82a75a13 100644
--- a/meson.build
+++ b/meson.build
@@ -618,7 +618,7 @@ glib_have_cocoa = cc.compiles('''#include <Cocoa/Cocoa.h>
 
 if glib_have_cocoa
   glib_conf.set('HAVE_COCOA', true)
-  osx_ldflags += '-Wl,-framework,Foundation -Wl,-framework,AppKit'
+  osx_ldflags += ['-Wl,-framework,Foundation', '-Wl,-framework,AppKit']
 endif
 
 add_project_link_arguments(osx_ldflags, language : 'c')
@@ -1765,9 +1765,7 @@ if libmount_dep.length() != 0
   glib_conf.set('HAVE_LIBMOUNT', 1)
 endif
 glib_conf.set('GIO_MODULE_DIR', glib_giomodulesdir)
-# FIXME: Missing:
-# @COCOA_LIBS@ @CARBON_LIBS@ @G_LIBS_EXTRA@ @GLIB_EXTRA_CFLAGS@
-# @G_MODULE_LDFLAGS@
+# FIXME: Missing: @G_LIBS_EXTRA@ @GLIB_EXTRA_CFLAGS@ @G_MODULE_LDFLAGS@
 
 # Tracing: dtrace
 want_dtrace = get_option('dtrace')


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]