[Libreoffice-commits] .: sal/Library_sal.mk solenv/gbuild

[Matus Kukan]

 sal/Library_sal.mk               |    4 +++-
 solenv/gbuild/platform/macosx.mk |    1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 683e471f3559b3dc40dc697576baf0be9612b1fc
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Wed Dec 21 15:26:55 2011 +0100

    gbuild, sal: dl is linux only

diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 93bc646..6f940db 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -56,10 +56,12 @@ $(eval $(call gb_Library_add_defs,sal,\
 $(eval $(call gb_Library_add_linked_libs,sal,\
 	$(if $(filter $(GUI),UNX), \
 		$(if $(filter $(OS),ANDROID),, \
-			dl \
 			pthread \
 		) \
 	) \
+	$(if $(filter $(OS),LINUX), \
+		dl \
+	) \
 	$(if $(filter $(OS),SOLARIS), \
 		nsl \
 		socket \
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index f7f3440..ef82a82 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -265,7 +265,6 @@ gb_Library_PLAINLIBS_NONE += \
 	Cocoa \
 	objc \
 	OpenGL \
-	dl \
 	m \
 	pthread \