gbuild: replace direct gb_STDLIBS use with ...

... new gb_LinkTarget_add_standard_system_libs

Change-Id: Ib2bc843098db3d8c6822b45a3d21724e67f57d69

33 files changed, 69 insertions, 34 deletions

diff --git a/sal/CppunitTest_Module_DLL.mk b/sal/CppunitTest_Module_DLL.mk
index d2f5079723e3..fe58e255a2df 100644
--- a/sal/CppunitTest_Module_DLL.mk
+++ b/sal/CppunitTest_Module_DLL.mk
@@ -37,7 +37,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,Module_DLL,\
 $(eval $(call gb_CppunitTest_use_libraries,Module_DLL,\
     sal \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_standard_system_libs,Module_DLL))
+
 # vim: set noet sw=4 ts=4:
diff --git a/sal/CppunitTest_sal_bytesequence.mk b/sal/CppunitTest_sal_bytesequence.mk
index cdb62c7e4334..222f77a7b53c 100644
--- a/sal/CppunitTest_sal_bytesequence.mk
+++ b/sal/CppunitTest_sal_bytesequence.mk
@@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_bytesequence,\
 $(eval $(call gb_CppunitTest_use_libraries,sal_bytesequence,\
     sal \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_bytesequence))
+
 # vim: set noet sw=4 ts=4:
diff --git a/sal/CppunitTest_sal_checkapi.mk b/sal/CppunitTest_sal_checkapi.mk
index 8b7ca18c9339..b61a739dbe2c 100644
--- a/sal/CppunitTest_sal_checkapi.mk
+++ b/sal/CppunitTest_sal_checkapi.mk
@@ -45,7 +45,8 @@ $(call gb_CxxObject_get_target,sal/qa/checkapi/strings) :| \
 $(eval $(call gb_CppunitTest_use_libraries,sal_checkapi,\
     sal \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_checkapi))
+
 # vim: set noet sw=4 ts=4:
diff --git a/sal/CppunitTest_sal_osl_condition.mk b/sal/CppunitTest_sal_osl_condition.mk
index 4c90de256844..0dad649efa4c 100644
--- a/sal/CppunitTest_sal_osl_condition.mk
+++ b/sal/CppunitTest_sal_osl_condition.mk
@@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_condition,\
 $(eval $(call gb_CppunitTest_use_libraries,sal_osl_condition,\
     sal \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_condition))
+
 # vim: set noet sw=4 ts=4:
diff --git a/sal/CppunitTest_sal_osl_file.mk b/sal/CppunitTest_sal_osl_file.mk
index dfd5d592f999..ea64e55daca7 100644
--- a/sal/CppunitTest_sal_osl_file.mk
+++ b/sal/CppunitTest_sal_osl_file.mk
@@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_file,\
 $(eval $(call gb_CppunitTest_use_libraries,sal_osl_file,\
     sal \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_file))
+
 # vim: set noet sw=4 ts=4:
diff --git a/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk b/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk
index 199f94cc3fc1..af121a42f62e 100644
--- a/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk
+++ b/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk
@@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_getsystempathfromfile
 $(eval $(call gb_CppunitTest_use_libraries,sal_osl_getsystempathfromfileurl,\
     sal \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_getsystempathfromfileurl))
+
 # vim: set noet sw=4 ts=4:
diff --git a/sal/CppunitTest_sal_osl_module.mk b/sal/CppunitTest_sal_osl_module.mk
index 7b75f8a3e0fc..93a24b4fdd8d 100644
--- a/sal/CppunitTest_sal_osl_module.mk
+++ b/sal/CppunitTest_sal_osl_module.mk
@@ -38,7 +38,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_module,\
 $(eval $(call gb_CppunitTest_use_libraries,sal_osl_module,\
     sal \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_module))
+
 # vim: set noet sw=4 ts=4:
diff --git a/sal/CppunitTest_sal_osl_mutex.mk b/sal/CppunitTest_sal_osl_mutex.mk
index 131761d1d078..7768b1e5ce99 100644
--- a/sal/CppunitTest_sal_osl_mutex.mk
+++ b/sal/CppunitTest_sal_osl_mutex.mk
@@ -35,7 +35,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_mutex, \
 $(eval $(call gb_CppunitTest_use_libraries,sal_osl_mutex, \
     sal \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_mutex))
+
 # vim: set noet sw=4 ts=4:
diff --git a/sal/CppunitTest_sal_osl_old_test_file.mk b/sal/CppunitTest_sal_osl_old_test_file.mk
index 3828b7784b9a..3b9040c2f519 100644
--- a/sal/CppunitTest_sal_osl_old_test_file.mk
+++ b/sal/CppunitTest_sal_osl_old_test_file.mk
@@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_old_test_file,\
 $(eval $(call gb_CppunitTest_use_libraries,sal_osl_old_test_file,\
     sal \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_old_test_file))
+
 # vim: set noet sw=4 ts=4:
diff --git a/sal/CppunitTest_sal_osl_pipe.mk b/sal/CppunitTest_sal_osl_pipe.mk
index 4aa70952531b..a71937b15342 100644
--- a/sal/CppunitTest_sal_osl_pipe.mk
+++ b/sal/CppunitTest_sal_osl_pipe.mk
@@ -36,7 +36,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_pipe, \
     sal \
     unotest \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_pipe))
+
 # vim: set noet sw=4 ts=4:
diff --git a/sal/CppunitTest_sal_osl_process.mk b/sal/CppunitTest_sal_osl_process.mk
index 6a53add92dae..4ee7e3f6eba6 100644
--- a/sal/CppunitTest_sal_osl_process.mk
+++ b/sal/CppunitTest_sal_osl_process.mk
@@ -20,7 +20,9 @@
 # For minor contributions see the git repository.
 #
 # Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+#se_libraries,sal_osl_process,\
+    sal \
+	$(g either the GNU General Public License Version 3 or later (the "GPLv3+"), or
 # the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
@@ -34,9 +36,10 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_process,\
 $(eval $(call gb_CppunitTest_use_libraries,sal_osl_process,\
     sal \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_process))
+
 # Depend on to be tested executable
 $(call gb_CppunitTest_get_target,sal_osl_process) : \
 	$(call gb_Executable_get_target,osl_process_child)
diff --git a/sal/CppunitTest_sal_osl_profile.mk b/sal/CppunitTest_sal_osl_profile.mk
index 1195b7d55eb1..87d587f6632f 100644
--- a/sal/CppunitTest_sal_osl_profile.mk
+++ b/sal/CppunitTest_sal_osl_profile.mk
@@ -35,7 +35,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_profile, \
 $(eval $(call gb_CppunitTest_use_libraries,sal_osl_profile, \
     sal \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_profile))
+
 # vim: set noet sw=4 ts=4:
diff --git a/sal/CppunitTest_sal_osl_security.mk b/sal/CppunitTest_sal_osl_security.mk
index a583b7c423dc..edb6a96ed88c 100644
--- a/sal/CppunitTest_sal_osl_security.mk
+++ b/sal/CppunitTest_sal_osl_security.mk
@@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_security,\
 $(eval $(call gb_CppunitTest_use_libraries,sal_osl_security,\
     sal \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_security))
+
 # vim: set noet sw=4 ts=4:
diff --git a/sal/CppunitTest_sal_osl_setthreadname.mk b/sal/CppunitTest_sal_osl_setthreadname.mk
index 6d6f8df52238..f7024cae6f07 100644
--- a/sal/CppunitTest_sal_osl_setthreadname.mk
+++ b/sal/CppunitTest_sal_osl_setthreadname.mk
@@ -35,7 +35,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_setthreadname, \
 $(eval $(call gb_CppunitTest_use_libraries,sal_osl_setthreadname, \
     sal \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_setthreadname))
+
 # vim: set noet sw=4 ts=4:
diff --git a/sal/CppunitTest_sal_osl_thread.mk b/sal/CppunitTest_sal_osl_thread.mk
index b014c83e46ba..6feb7d59b584 100644
--- a/sal/CppunitTest_sal_osl_thread.mk
+++ b/sal/CppunitTest_sal_osl_thread.mk
@@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_thread,\
 $(eval $(call gb_CppunitTest_use_libraries,sal_osl_thread,\
     sal \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_thread))
+
 # vim: set noet sw=4 ts=4:
diff --git a/sal/CppunitTest_sal_rtl_alloc.mk b/sal/CppunitTest_sal_rtl_alloc.mk
index e6a52823b2a9..83405ab0a8b6 100644
--- a/sal/CppunitTest_sal_rtl_alloc.mk
+++ b/sal/CppunitTest_sal_rtl_alloc.mk
@@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_alloc,\
 $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_alloc,\
     sal \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_alloc))
+
 # vim: set noet sw=4 ts=4:
diff --git a/sal/CppunitTest_sal_rtl_cipher.mk b/sal/CppunitTest_sal_rtl_cipher.mk
index 78cca6b7b39a..ce2cc1da5a19 100644
--- a/sal/CppunitTest_sal_rtl_cipher.mk
+++ b/sal/CppunitTest_sal_rtl_cipher.mk
@@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_cipher,\
 $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_cipher,\
     sal \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_cipher))
+
 # vim: set noet sw=4 ts=4:
diff --git a/sal/CppunitTest_sal_rtl_crc32.mk b/sal/CppunitTest_sal_rtl_crc32.mk
index 1c5b6d19c71d..1a2390f5fd2e 100644
--- a/sal/CppunitTest_sal_rtl_crc32.mk
+++ b/sal/CppunitTest_sal_rtl_crc32.mk
@@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_crc32,\
 $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_crc32,\
     sal \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_crc32))
+
 # vim: set noet sw=4 ts=4:
diff --git a/sal/CppunitTest_sal_rtl_doublelock.mk b/sal/CppunitTest_sal_rtl_doublelock.mk
index 9c11d796de49..e4fd8f2bf4b4 100644
--- a/sal/CppunitTest_sal_rtl_doublelock.mk
+++ b/sal/CppunitTest_sal_rtl_doublelock.mk
@@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_doublelock,\
 $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_doublelock,\
     sal \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_doublelock))
+
 # vim: set noet sw=4 ts=4:
diff --git a/sal/CppunitTest_sal_rtl_locale.mk b/sal/CppunitTest_sal_rtl_locale.mk
index 613251ef6c13..ce1f0ab9ce1c 100644
--- a/sal/CppunitTest_sal_rtl_locale.mk
+++ b/sal/CppunitTest_sal_rtl_locale.mk
@@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_locale,\
 $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_locale,\
     sal \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_locale))
+
 # vim: set noet sw=4 ts=4:
diff --git a/sal/CppunitTest_sal_rtl_math.mk b/sal/CppunitTest_sal_rtl_math.mk
index df570a552b0d..c502ab226659 100644
--- a/sal/CppunitTest_sal_rtl_math.mk
+++ b/sal/CppunitTest_sal_rtl_math.mk
@@ -35,7 +35,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_math, \
 $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_math, \
     sal \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_math))
+
 # vim: set noet sw=4 ts=4:
diff --git a/sal/CppunitTest_sal_rtl_ostringbuffer.mk b/sal/CppunitTest_sal_rtl_ostringbuffer.mk
index f0ea74c7ca97..8c38783b7a93 100644
--- a/sal/CppunitTest_sal_rtl_ostringbuffer.mk
+++ b/sal/CppunitTest_sal_rtl_ostringbuffer.mk
@@ -35,7 +35,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_ostringbuffer,\
 $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_ostringbuffer,\
     sal \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_ostringbuffer))
+
 # vim: set noet sw=4 ts=4:
diff --git a/sal/CppunitTest_sal_rtl_oustringbuffer.mk b/sal/CppunitTest_sal_rtl_oustringbuffer.mk
index f2384f709cdc..bb316eeda619 100644
--- a/sal/CppunitTest_sal_rtl_oustringbuffer.mk
+++ b/sal/CppunitTest_sal_rtl_oustringbuffer.mk
@@ -38,7 +38,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_oustringbuffer,\
 $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_oustringbuffer,\
     sal \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_oustringbuffer))
+
 # vim: set noet sw=4 ts=4:
diff --git a/sal/CppunitTest_sal_rtl_strings.mk b/sal/CppunitTest_sal_rtl_strings.mk
index bdab2fb48987..67299a3ab9d2 100644
--- a/sal/CppunitTest_sal_rtl_strings.mk
+++ b/sal/CppunitTest_sal_rtl_strings.mk
@@ -41,9 +41,10 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_strings,\
 $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_strings,\
     sal \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_strings))
+
 # The test uses O(U)String capabilities that dlopen this lib
 ifneq ($(OS),ANDROID)
 # Except that on Android we don't build it separately
diff --git a/sal/CppunitTest_sal_rtl_uri.mk b/sal/CppunitTest_sal_rtl_uri.mk
index 69e701b794ab..67ce1eab2732 100644
--- a/sal/CppunitTest_sal_rtl_uri.mk
+++ b/sal/CppunitTest_sal_rtl_uri.mk
@@ -23,9 +23,10 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_uri,\
 $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_uri,\
     sal \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_uri))
+
 # The test uses O(U)String capabilities that dlopen this lib
 ifneq ($(OS),ANDROID)
 # Except that on Android we don't build it separately
diff --git a/sal/CppunitTest_sal_rtl_uuid.mk b/sal/CppunitTest_sal_rtl_uuid.mk
index 8be994595e1f..74ea9e057f6c 100644
--- a/sal/CppunitTest_sal_rtl_uuid.mk
+++ b/sal/CppunitTest_sal_rtl_uuid.mk
@@ -22,7 +22,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_uuid,\
 $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_uuid,\
     sal \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_uuid))
+
 # vim: set noet sw=4 ts=4:
diff --git a/sal/CppunitTest_sal_tcwf.mk b/sal/CppunitTest_sal_tcwf.mk
index 7efbad135f36..fd202e2adec8 100644
--- a/sal/CppunitTest_sal_tcwf.mk
+++ b/sal/CppunitTest_sal_tcwf.mk
@@ -35,7 +35,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_tcwf,\
 $(eval $(call gb_CppunitTest_use_libraries,sal_tcwf,\
     sal \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_tcwf))
+
 # vim: set noet sw=4 ts=4:
diff --git a/sal/CppunitTest_sal_types.mk b/sal/CppunitTest_sal_types.mk
index 720f5ee3cf0b..942e8f318c35 100644
--- a/sal/CppunitTest_sal_types.mk
+++ b/sal/CppunitTest_sal_types.mk
@@ -34,7 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_types,\
 $(eval $(call gb_CppunitTest_use_libraries,sal_types,\
     sal \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_types))
+
 # vim: set noet sw=4 ts=4:
diff --git a/sal/Executable_cppunittester.mk b/sal/Executable_cppunittester.mk
index c8d8f4756222..9cf275e91476 100644
--- a/sal/Executable_cppunittester.mk
+++ b/sal/Executable_cppunittester.mk
@@ -35,9 +35,10 @@ $(eval $(call gb_Executable_set_include,cppunit/cppunittester,\
 $(eval $(call gb_Executable_use_libraries,cppunit/cppunittester,\
 	sal \
 	$(gb_UWINAPI) \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Executable_add_standard_system_libs,cppunit/cppunittester))
+
 $(eval $(call gb_Executable_use_external,cppunit/cppunittester,cppunit))
 
 $(eval $(call gb_Executable_add_exception_objects,cppunit/cppunittester,\
diff --git a/sal/Executable_osl_process_child.mk b/sal/Executable_osl_process_child.mk
index d43400d6d86f..3f3cce24c160 100644
--- a/sal/Executable_osl_process_child.mk
+++ b/sal/Executable_osl_process_child.mk
@@ -32,9 +32,10 @@ $(eval $(call gb_Executable_Executable,osl_process_child))
 $(eval $(call gb_Executable_use_libraries,osl_process_child,\
 	sal \
 	$(gb_UWINAPI) \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Executable_add_standard_system_libs,osl_process_child))
+
 $(eval $(call gb_Executable_add_exception_objects,osl_process_child,\
 	sal/qa/osl/process/osl_process_child \
 ))
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 653aa0bdafad..f5b3b3d4e689 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -82,9 +82,10 @@ $(eval $(call gb_Library_use_libraries,sal,\
 		lo-bootstrap \
 	) \
 	$(gb_UWINAPI) \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,sal))
+
 ifeq ($(OS),MACOSX)
 $(eval $(call gb_Library_use_externals,sal,\
 	carbon \
diff --git a/sal/Library_sal_textenc.mk b/sal/Library_sal_textenc.mk
index 94f69911cebc..c50fa94ce6e4 100644
--- a/sal/Library_sal_textenc.mk
+++ b/sal/Library_sal_textenc.mk
@@ -30,9 +30,10 @@ $(eval $(call gb_Library_Library,sal_textenc))
 $(eval $(call gb_Library_use_libraries,sal_textenc,\
 	sal \
 	$(gb_UWINAPI) \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,sal_textenc))
+
 $(eval $(call gb_Library_add_defs,sal_textenc,\
 	$(LFS_CFLAGS) \
 ))
diff --git a/sal/Library_uwinapi.mk b/sal/Library_uwinapi.mk
index aa06e116f93a..c5356c9f00d0 100644
--- a/sal/Library_uwinapi.mk
+++ b/sal/Library_uwinapi.mk
@@ -35,9 +35,10 @@ $(eval $(call gb_Library_use_libraries,uwinapi,\
 		user32 \
 		version \
 	) \
-	$(filter-out uwinapi,$(gb_STDLIBS)) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,uwinapi))
+
 $(eval $(call gb_Library_add_defs,uwinapi,\
 	$(if $(filter $(COM),GCC), \
 		-Wno-unused-parameter -Wno-return-type) \