From f3ff037bd147b7d86f23108660a2fe71df5268a6 Mon Sep 17 00:00:00 2001 From: Daniel Macks Date: Tue, 5 Jun 2012 19:20:13 -0400 Subject: [PATCH] Pass -framework sub-flag without embedded whitespace The "-framework" linker flag takes a second word as a parameter. If they are passed separated with whitespace, some flag-handling routines may not know to keep the two words together as a single unit. Use -Wl,, to pass multiple words without embedded whitespace. https://bugzilla.gnome.org/show_bug.cgi?id=566994 --- configure.ac | 4 ++-- gio/Makefile.am | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index dfecda068..f7c24716c 100644 --- a/configure.ac +++ b/configure.ac @@ -219,12 +219,12 @@ AC_SUBST(LIBTOOL_EXPORT_OPTIONS) AS_IF([test "x$glib_have_carbon" = "xyes"], [ AC_DEFINE(HAVE_CARBON, 1, [define to 1 if Carbon is available]) - LDFLAGS="$LDFLAGS -framework Carbon" + LDFLAGS="$LDFLAGS -Wl,-framework,Carbon" ]) if test "x$glib_have_cocoa" = "xyes"; then AC_DEFINE(HAVE_COCOA, 1, [define to 1 if Cocoa is available]) - LDFLAGS="$LDFLAGS -framework Foundation" + LDFLAGS="$LDFLAGS -Wl,-framework,Foundation" fi gl_GLIBC21 diff --git a/gio/Makefile.am b/gio/Makefile.am index 97d108294..7c07010f1 100644 --- a/gio/Makefile.am +++ b/gio/Makefile.am @@ -515,7 +515,7 @@ libgio_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \ if OS_COCOA # This is dumb. The ObjC source file should be properly named .m libgio_2_0_la_CFLAGS = -xobjective-c -libgio_2_0_la_LDFLAGS += -framework Foundation +libgio_2_0_la_LDFLAGS += -Wl,-framework,Foundation endif libgio_2_0_la_DEPENDENCIES = $(gio_win32_res) $(gio_def) $(platform_deps)