gbuild: gb_Library_PLAINLIBS_NONE cleanup for unxgcc/solaris

Change-Id: Ia7f64bdd0fd81c5dcc08d828db4602b65e2da949

17 files changed, 74 insertions, 23 deletions

diff --git a/bridges/Library_gcc3_aix_powerpc.mk b/bridges/Library_gcc3_aix_powerpc.mk
index 4cf7a7048526..0b541926e2b1 100644
--- a/bridges/Library_gcc3_aix_powerpc.mk
+++ b/bridges/Library_gcc3_aix_powerpc.mk
@@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\
 	-fno-strict-aliasing \
 ))
 
+$(eval $(call gb_Library_add_libs,gcc3_uno,\
+	-ldl \
+))
+
 $(eval $(call gb_Library_use_libraries,gcc3_uno,\
 	cppu \
-	dl \
 	sal \
 ))
 
diff --git a/bridges/Library_gcc3_ios_arm.mk b/bridges/Library_gcc3_ios_arm.mk
index e121354bbf27..6744aa4c8863 100644
--- a/bridges/Library_gcc3_ios_arm.mk
+++ b/bridges/Library_gcc3_ios_arm.mk
@@ -40,9 +40,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\
 	-fno-strict-aliasing \
 ))
 
+$(eval $(call gb_Library_add_libs,gcc3_uno,\
+	-ldl \
+))
+
 $(eval $(call gb_Library_use_libraries,gcc3_uno,\
 	cppu \
-	dl \
 	sal \
 ))
 
diff --git a/bridges/Library_gcc3_linux_alpha.mk b/bridges/Library_gcc3_linux_alpha.mk
index 22cd307a852b..77d331d390c3 100644
--- a/bridges/Library_gcc3_linux_alpha.mk
+++ b/bridges/Library_gcc3_linux_alpha.mk
@@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\
 	-fno-strict-aliasing \
 ))
 
+$(eval $(call gb_Library_add_libs,gcc3_uno,\
+	-ldl \
+))
+
 $(eval $(call gb_Library_use_libraries,gcc3_uno,\
 	cppu \
-	dl \
 	sal \
 ))
 
diff --git a/bridges/Library_gcc3_linux_arm.mk b/bridges/Library_gcc3_linux_arm.mk
index ae0df1bad934..6a0fcba73cb2 100644
--- a/bridges/Library_gcc3_linux_arm.mk
+++ b/bridges/Library_gcc3_linux_arm.mk
@@ -36,11 +36,14 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\
 	-fno-strict-aliasing \
 ))
 
+ifneq ($(OS),ANDROID)
+$(eval $(call gb_Library_add_libs,gcc3_uno,\
+	-ldl \
+))
+endif
+
 $(eval $(call gb_Library_use_libraries,gcc3_uno,\
 	cppu \
-	$(if $(filter-out ANDROID,$(OS)),\
-		dl \
-	) \
 	sal \
 ))
 
diff --git a/bridges/Library_gcc3_linux_hppa.mk b/bridges/Library_gcc3_linux_hppa.mk
index 8aa77b5df83f..fea698d9f4ad 100644
--- a/bridges/Library_gcc3_linux_hppa.mk
+++ b/bridges/Library_gcc3_linux_hppa.mk
@@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\
 	-fno-strict-aliasing \
 ))
 
+$(eval $(call gb_Library_add_libs,gcc3_uno,\
+	-ldl \
+))
+
 $(eval $(call gb_Library_use_libraries,gcc3_uno,\
 	cppu \
-	dl \
 	sal \
 ))
 
diff --git a/bridges/Library_gcc3_linux_ia64.mk b/bridges/Library_gcc3_linux_ia64.mk
index 8f8f61c00bcd..6f71829dc9f3 100644
--- a/bridges/Library_gcc3_linux_ia64.mk
+++ b/bridges/Library_gcc3_linux_ia64.mk
@@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\
 	-fno-strict-aliasing \
 ))
 
+$(eval $(call gb_Library_add_libs,gcc3_uno,\
+	-ldl \
+))
+
 $(eval $(call gb_Library_use_libraries,gcc3_uno,\
 	cppu \
-	dl \
 	sal \
 ))
 
diff --git a/bridges/Library_gcc3_linux_intel.mk b/bridges/Library_gcc3_linux_intel.mk
index 526a1c95b322..97a37033f30a 100644
--- a/bridges/Library_gcc3_linux_intel.mk
+++ b/bridges/Library_gcc3_linux_intel.mk
@@ -39,11 +39,14 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\
 	) \
 ))
 
+ifneq ($(OS),ANDROID)
+$(eval $(call gb_Library_add_libs,gcc3_uno,\
+	-ldl \
+))
+endif
+
 $(eval $(call gb_Library_use_libraries,gcc3_uno,\
 	cppu \
-	$(if $(filter-out ANDROID,$(OS)),\
-		dl \
-	) \
 	sal \
 ))
 
diff --git a/bridges/Library_gcc3_linux_m68k.mk b/bridges/Library_gcc3_linux_m68k.mk
index db74e2a26126..5175d374246b 100644
--- a/bridges/Library_gcc3_linux_m68k.mk
+++ b/bridges/Library_gcc3_linux_m68k.mk
@@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\
 	-fno-strict-aliasing \
 ))
 
+$(eval $(call gb_Library_add_libs,gcc3_uno,\
+	-ldl \
+))
+
 $(eval $(call gb_Library_use_libraries,gcc3_uno,\
 	cppu \
-	dl \
 	sal \
 ))
 
diff --git a/bridges/Library_gcc3_linux_mips.mk b/bridges/Library_gcc3_linux_mips.mk
index 4cd01957c3dd..91613d9ddcd4 100644
--- a/bridges/Library_gcc3_linux_mips.mk
+++ b/bridges/Library_gcc3_linux_mips.mk
@@ -36,11 +36,14 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\
 	-fno-strict-aliasing \
 ))
 
+ifneq ($(OS),ANDROID)
+$(eval $(call gb_Library_add_libs,gcc3_uno,\
+	-ldl \
+))
+endif
+
 $(eval $(call gb_Library_use_libraries,gcc3_uno,\
 	cppu \
-	$(if $(filter-out ANDROID,$(OS)),\
-		dl \
-	) \
 	sal \
 ))
 
diff --git a/bridges/Library_gcc3_linux_powerpc.mk b/bridges/Library_gcc3_linux_powerpc.mk
index 0ae99a60e916..cbf62694e062 100644
--- a/bridges/Library_gcc3_linux_powerpc.mk
+++ b/bridges/Library_gcc3_linux_powerpc.mk
@@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\
 	-fno-strict-aliasing \
 ))
 
+$(eval $(call gb_Library_add_libs,gcc3_uno,\
+	-ldl \
+))
+
 $(eval $(call gb_Library_use_libraries,gcc3_uno,\
 	cppu \
-	dl \
 	sal \
 ))
 
diff --git a/bridges/Library_gcc3_linux_powerpc64.mk b/bridges/Library_gcc3_linux_powerpc64.mk
index 037d4054599d..acb1f3f1a3c9 100644
--- a/bridges/Library_gcc3_linux_powerpc64.mk
+++ b/bridges/Library_gcc3_linux_powerpc64.mk
@@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\
 	-fno-strict-aliasing \
 ))
 
+$(eval $(call gb_Library_add_libs,gcc3_uno,\
+	-ldl \
+))
+
 $(eval $(call gb_Library_use_libraries,gcc3_uno,\
 	cppu \
-	dl \
 	sal \
 ))
 
diff --git a/bridges/Library_gcc3_linux_s390.mk b/bridges/Library_gcc3_linux_s390.mk
index cd9dbf3444f4..2624e9e176d5 100644
--- a/bridges/Library_gcc3_linux_s390.mk
+++ b/bridges/Library_gcc3_linux_s390.mk
@@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\
 	-fno-strict-aliasing \
 ))
 
+$(eval $(call gb_Library_add_libs,gcc3_uno,\
+	-ldl \
+))
+
 $(eval $(call gb_Library_use_libraries,gcc3_uno,\
 	cppu \
-	dl \
 	sal \
 ))
 
diff --git a/bridges/Library_gcc3_linux_s390x.mk b/bridges/Library_gcc3_linux_s390x.mk
index a04ebad91250..d2400e98b157 100644
--- a/bridges/Library_gcc3_linux_s390x.mk
+++ b/bridges/Library_gcc3_linux_s390x.mk
@@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\
 	-fno-strict-aliasing \
 ))
 
+$(eval $(call gb_Library_add_libs,gcc3_uno,\
+	-ldl \
+))
+
 $(eval $(call gb_Library_use_libraries,gcc3_uno,\
 	cppu \
-	dl \
 	sal \
 ))
 
diff --git a/bridges/Library_gcc3_linux_sparc.mk b/bridges/Library_gcc3_linux_sparc.mk
index 778cbb12a6e8..5b2a9dc5bc19 100644
--- a/bridges/Library_gcc3_linux_sparc.mk
+++ b/bridges/Library_gcc3_linux_sparc.mk
@@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\
 	-fno-strict-aliasing \
 ))
 
+$(eval $(call gb_Library_add_libs,gcc3_uno,\
+	-ldl \
+))
+
 $(eval $(call gb_Library_use_libraries,gcc3_uno,\
 	cppu \
-	dl \
 	sal \
 ))
 
diff --git a/bridges/Library_gcc3_linux_x86-64.mk b/bridges/Library_gcc3_linux_x86-64.mk
index 244bdda8dae2..b1e596778730 100644
--- a/bridges/Library_gcc3_linux_x86-64.mk
+++ b/bridges/Library_gcc3_linux_x86-64.mk
@@ -41,9 +41,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\
 	) \
 ))
 
+$(eval $(call gb_Library_add_libs,gcc3_uno,\
+	-ldl \
+))
+
 $(eval $(call gb_Library_use_libraries,gcc3_uno,\
 	cppu \
-	dl \
 	sal \
 ))
 
diff --git a/bridges/Library_gcc3_solaris_intel.mk b/bridges/Library_gcc3_solaris_intel.mk
index c333ca8d3db0..f3175faea884 100644
--- a/bridges/Library_gcc3_solaris_intel.mk
+++ b/bridges/Library_gcc3_solaris_intel.mk
@@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\
 	-fno-strict-aliasing \
 ))
 
+$(eval $(call gb_Library_add_libs,gcc3_uno,\
+	-ldl \
+))
+
 $(eval $(call gb_Library_use_libraries,gcc3_uno,\
 	cppu \
-	dl \
 	sal \
 ))
 
diff --git a/bridges/Library_gcc3_solaris_sparc.mk b/bridges/Library_gcc3_solaris_sparc.mk
index 3829f219b8d9..5dab7c0345d0 100644
--- a/bridges/Library_gcc3_solaris_sparc.mk
+++ b/bridges/Library_gcc3_solaris_sparc.mk
@@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\
 	-fno-strict-aliasing \
 ))
 
+$(eval $(call gb_Library_add_libs,gcc3_uno,\
+	-ldl \
+))
+
 $(eval $(call gb_Library_use_libraries,gcc3_uno,\
 	cppu \
-	dl \
 	sal \
 ))