gbuild: replace direct gb_STDLIBS use with ...

... new gb_LinkTarget_add_standard_system_libs

Change-Id: Ib2bc843098db3d8c6822b45a3d21724e67f57d69

11 files changed, 22 insertions, 11 deletions

diff --git a/cppu/CppunitTest_cppu_checkapi.mk b/cppu/CppunitTest_cppu_checkapi.mk
index e68cc5cd5241..af9e7ea16b48 100644
--- a/cppu/CppunitTest_cppu_checkapi.mk
+++ b/cppu/CppunitTest_cppu_checkapi.mk
@@ -50,7 +50,8 @@ $(call gb_CxxObject_get_target,cppu/qa/checkapi/strings) :| \
 $(eval $(call gb_CppunitTest_use_libraries,cppu_checkapi,\
     cppu \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_checkapi))
+
 # vim: set noet sw=4 ts=4:
diff --git a/cppu/CppunitTest_cppu_qa_any.mk b/cppu/CppunitTest_cppu_qa_any.mk
index 04f33de964ba..2b5f4653ee32 100644
--- a/cppu/CppunitTest_cppu_qa_any.mk
+++ b/cppu/CppunitTest_cppu_qa_any.mk
@@ -35,9 +35,10 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_any, \
 	cppu \
 	sal \
 	$(gb_UWINAPI) \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_qa_any))
+
 $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_any, \
 	cppu \
 	udkapi \
diff --git a/cppu/CppunitTest_cppu_qa_recursion.mk b/cppu/CppunitTest_cppu_qa_recursion.mk
index 671bd7f4eccf..dffd187d01a1 100644
--- a/cppu/CppunitTest_cppu_qa_recursion.mk
+++ b/cppu/CppunitTest_cppu_qa_recursion.mk
@@ -35,9 +35,10 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_recursion, \
 	cppu \
 	sal \
 	$(gb_UWINAPI) \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_qa_recursion))
+
 $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_recursion, \
 	cppu \
 	udkapi \
diff --git a/cppu/CppunitTest_cppu_qa_reference.mk b/cppu/CppunitTest_cppu_qa_reference.mk
index 4eef2ae78385..d2b59a27d5f9 100644
--- a/cppu/CppunitTest_cppu_qa_reference.mk
+++ b/cppu/CppunitTest_cppu_qa_reference.mk
@@ -35,9 +35,10 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_reference, \
 	cppu \
 	sal \
 	$(gb_UWINAPI) \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_qa_reference))
+
 $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_reference, \
 	cppu \
 	udkapi \
diff --git a/cppu/CppunitTest_cppu_qa_unotype.mk b/cppu/CppunitTest_cppu_qa_unotype.mk
index 963ace47a15b..ddc84583ff05 100644
--- a/cppu/CppunitTest_cppu_qa_unotype.mk
+++ b/cppu/CppunitTest_cppu_qa_unotype.mk
@@ -35,9 +35,10 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_unotype, \
 	cppu \
 	sal \
 	$(gb_UWINAPI) \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_qa_unotype))
+
 $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_unotype, \
 	cppu \
 	udkapi \
diff --git a/cppu/CppunitTest_cppu_test_cppumaker.mk b/cppu/CppunitTest_cppu_test_cppumaker.mk
index 41da8e269314..7472a3619da2 100644
--- a/cppu/CppunitTest_cppu_test_cppumaker.mk
+++ b/cppu/CppunitTest_cppu_test_cppumaker.mk
@@ -35,9 +35,10 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_test_cppumaker, \
 	cppu \
 	sal \
 	$(gb_UWINAPI) \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_test_cppumaker))
+
 $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_test_cppumaker, \
 	cppu \
 	udkapi \
diff --git a/cppu/Library_affine_uno.mk b/cppu/Library_affine_uno.mk
index 2103eb49b77b..644c82054e85 100644
--- a/cppu/Library_affine_uno.mk
+++ b/cppu/Library_affine_uno.mk
@@ -33,9 +33,10 @@ $(eval $(call gb_Library_use_libraries,affine_uno,\
 	purpenvhelper \
 	sal \
 	$(gb_UWINAPI) \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,affine_uno))
+
 $(eval $(call gb_Library_add_exception_objects,affine_uno,\
 	cppu/source/AffineBridge/AffineBridge \
 ))
diff --git a/cppu/Library_cppu.mk b/cppu/Library_cppu.mk
index de47490923b5..4bdbb01d2565 100644
--- a/cppu/Library_cppu.mk
+++ b/cppu/Library_cppu.mk
@@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,cppu,\
 	sal \
 	salhelper \
 	$(gb_UWINAPI) \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,cppu))
+
 $(eval $(call gb_Library_add_cobjects,cppu,\
 	cppu/source/uno/EnvDcp \
 ))
diff --git a/cppu/Library_log_uno.mk b/cppu/Library_log_uno.mk
index 04d9b7d8d588..aacb8ed73495 100644
--- a/cppu/Library_log_uno.mk
+++ b/cppu/Library_log_uno.mk
@@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,log_uno,\
 	purpenvhelper \
 	sal \
 	$(gb_UWINAPI) \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,log_uno))
+
 $(eval $(call gb_Library_add_exception_objects,log_uno,\
 	cppu/source/LogBridge/LogBridge \
 ))
diff --git a/cppu/Library_purpenvhelper.mk b/cppu/Library_purpenvhelper.mk
index 05606523a758..de60f76c5ce0 100644
--- a/cppu/Library_purpenvhelper.mk
+++ b/cppu/Library_purpenvhelper.mk
@@ -39,9 +39,10 @@ $(eval $(call gb_Library_use_libraries,purpenvhelper,\
 	cppu \
 	sal \
 	$(gb_UWINAPI) \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,purpenvhelper))
+
 $(eval $(call gb_Library_add_exception_objects,purpenvhelper,\
 	cppu/source/helper/purpenv/helper_purpenv_Environment \
 	cppu/source/helper/purpenv/helper_purpenv_Mapping \
diff --git a/cppu/Library_unsafe_uno.mk b/cppu/Library_unsafe_uno.mk
index afeb4cc6af22..9b3eb68418f4 100644
--- a/cppu/Library_unsafe_uno.mk
+++ b/cppu/Library_unsafe_uno.mk
@@ -33,9 +33,10 @@ $(eval $(call gb_Library_use_libraries,unsafe_uno,\
 	purpenvhelper \
 	sal \
 	$(gb_UWINAPI) \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,unsafe_uno))
+
 $(eval $(call gb_Library_add_exception_objects,unsafe_uno,\
 	cppu/source/UnsafeBridge/UnsafeBridge \
 ))