From cee32aae398283c38b42c73add694e9d074a5d62 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Fri, 28 Sep 2012 00:18:12 +0200
Subject: gbuild: clean up Mac OS X framework handling:

There are currently 3 different mechanisms being used for frameworks,
which is of course intolerable so we invent a 4th one and standardize on
it:  gb_LinkTarget_use_darwin_frameworks

(This doesn't mean using add_libs or externals was wrong, it was just
inconsistent... and i don't see an obvious benefit of using externals here)

Change-Id: I5de9020402c87e7236c6a358c47f02fa56642d3d
---
 sfx2/Library_sfx.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'sfx2/Library_sfx.mk')

diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 23badc19286e..c384a1b98046 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -280,8 +280,10 @@ ifeq ($(OS),MACOSX)
 $(eval $(call gb_Library_add_objcxxobjects,sfx,\
     sfx2/source/appl/shutdowniconaqua \
 ))
-$(eval $(call gb_Library_use_libraries,sfx,\
-    objc \
+$(eval $(call gb_Library_add_libs,sfx,\
+    -lobjc \
+))
+$(eval $(call gb_Library_use_system_darwin_frameworks,sfx,\
     Cocoa \
 ))
 endif
-- 
cgit