gbuild: replace direct gb_STDLIBS use with ...

... new gb_LinkTarget_add_standard_system_libs

Change-Id: Ib2bc843098db3d8c6822b45a3d21724e67f57d69

7 files changed, 14 insertions, 7 deletions

diff --git a/svtools/CppunitTest_svtools_filters_test.mk b/svtools/CppunitTest_svtools_filters_test.mk
index 65b4e1bea3ab..aff901c79df6 100644
--- a/svtools/CppunitTest_svtools_filters_test.mk
+++ b/svtools/CppunitTest_svtools_filters_test.mk
@@ -42,9 +42,10 @@ $(eval $(call gb_CppunitTest_use_libraries,svtools_filters_test, \
 	unotest \
 	vcl \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_standard_system_libs,svtools_filters_test))
+
 $(eval $(call gb_CppunitTest_use_api,svtools_filters_test,\
     udkapi \
     offapi \
diff --git a/svtools/Executable_bmp.mk b/svtools/Executable_bmp.mk
index f8fee180d891..e837abd32d58 100644
--- a/svtools/Executable_bmp.mk
+++ b/svtools/Executable_bmp.mk
@@ -43,9 +43,10 @@ $(eval $(call gb_Executable_use_libraries,bmp,\
     tl \
     vcl \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Executable_add_standard_system_libs,bmp))
+
 $(eval $(call gb_Executable_add_exception_objects,bmp,\
     svtools/bmpmaker/bmp \
     svtools/bmpmaker/bmpcore \
diff --git a/svtools/Executable_bmpsum.mk b/svtools/Executable_bmpsum.mk
index a00b928bd39a..7ae8dbf46dd3 100644
--- a/svtools/Executable_bmpsum.mk
+++ b/svtools/Executable_bmpsum.mk
@@ -42,9 +42,10 @@ $(eval $(call gb_Executable_use_libraries,bmpsum,\
     tl \
     vcl \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Executable_add_standard_system_libs,bmpsum))
+
 $(eval $(call gb_Executable_add_exception_objects,bmpsum,\
     svtools/bmpmaker/bmpsum \
 ))
diff --git a/svtools/Executable_g2g.mk b/svtools/Executable_g2g.mk
index 0936abd454cf..3dace37d6c7f 100644
--- a/svtools/Executable_g2g.mk
+++ b/svtools/Executable_g2g.mk
@@ -43,9 +43,10 @@ $(eval $(call gb_Executable_use_libraries,g2g,\
     tl \
     vcl \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Executable_add_standard_system_libs,g2g))
+
 $(eval $(call gb_Executable_add_exception_objects,g2g,\
     svtools/bmpmaker/g2g \
 ))
diff --git a/svtools/Executable_langsupport.mk b/svtools/Executable_langsupport.mk
index 532b78bbecb6..704e51b636ee 100644
--- a/svtools/Executable_langsupport.mk
+++ b/svtools/Executable_langsupport.mk
@@ -49,9 +49,10 @@ $(eval $(call gb_Executable_use_libraries,langsupport,\
     ucbhelper \
     vcl \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Executable_add_standard_system_libs,langsupport))
+
 $(eval $(call gb_Executable_add_exception_objects,langsupport,\
     svtools/langsupport/langsupport \
 ))
diff --git a/svtools/Library_hatchwindowfactory.mk b/svtools/Library_hatchwindowfactory.mk
index 1c7cb22309d7..1827cb1ae389 100644
--- a/svtools/Library_hatchwindowfactory.mk
+++ b/svtools/Library_hatchwindowfactory.mk
@@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,hatchwindowfactory,\
     tl \
     vcl \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,hatchwindowfactory))
+
 $(eval $(call gb_Library_add_exception_objects,hatchwindowfactory,\
     svtools/source/hatchwindow/documentcloser \
     svtools/source/hatchwindow/hatchwindow \
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index 7a2379b8c2cd..1f40a65b5001 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -63,9 +63,10 @@ $(eval $(call gb_Library_use_libraries,svt,\
     utl \
     vcl \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,svt))
+
 $(eval $(call gb_Library_use_externals,svt,\
     icuuc \
     jpeg \