Link most libs and executables with gb_STDLIBS as presumably is intended

9 files changed, 27 insertions, 0 deletions

diff --git a/i18npool/Library_collator_data.mk b/i18npool/Library_collator_data.mk
index 7f00e8bdcf63..cbf147b88e3c 100644
--- a/i18npool/Library_collator_data.mk
+++ b/i18npool/Library_collator_data.mk
@@ -30,6 +30,10 @@ $(eval $(call gb_Library_Library,collator_data))
 
 $(eval $(call gb_Library_add_package_headers,collator_data,i18npool_generated))
 
+$(eval $(call gb_Library_add_linked_libs,collator_data,\
+    $(gb_STDLIBS) \
+))
+
 $(eval $(call gb_Library_add_generated_exception_objects,collator_data,\
 	$(subst $(WORKDIR)/,,$(basename $(wildcard $(WORKDIR)/CustomTarget/i18npool/source/collator/collator_*.cxx))) \
 ))
diff --git a/i18npool/Library_dict_ja.mk b/i18npool/Library_dict_ja.mk
index be52e0f65252..9c388123e8eb 100644
--- a/i18npool/Library_dict_ja.mk
+++ b/i18npool/Library_dict_ja.mk
@@ -30,6 +30,10 @@ $(eval $(call gb_Library_Library,dict_ja))
 
 $(eval $(call gb_Library_add_package_headers,dict_ja,i18npool_generated))
 
+$(eval $(call gb_Library_add_linked_libs,dict_ja,\
+    $(gb_STDLIBS) \
+))
+
 $(eval $(call gb_Library_add_generated_exception_objects,dict_ja,\
 	CustomTarget/i18npool/source/breakiterator/data/dict_ja \
 ))
diff --git a/i18npool/Library_dict_zh.mk b/i18npool/Library_dict_zh.mk
index a29b2789b35e..5567780c5d1d 100644
--- a/i18npool/Library_dict_zh.mk
+++ b/i18npool/Library_dict_zh.mk
@@ -30,6 +30,10 @@ $(eval $(call gb_Library_Library,dict_zh))
 
 $(eval $(call gb_Library_add_package_headers,dict_zh,i18npool_generated))
 
+$(eval $(call gb_Library_add_linked_libs,dict_zh,\
+    $(gb_STDLIBS) \
+))
+
 $(eval $(call gb_Library_add_generated_exception_objects,dict_zh,\
 	CustomTarget/i18npool/source/breakiterator/data/dict_zh \
 ))
diff --git a/i18npool/Library_index_data.mk b/i18npool/Library_index_data.mk
index 43d4c520d44a..dd057d32d89b 100644
--- a/i18npool/Library_index_data.mk
+++ b/i18npool/Library_index_data.mk
@@ -30,6 +30,10 @@ $(eval $(call gb_Library_Library,index_data))
 
 $(eval $(call gb_Library_add_package_headers,index_data,i18npool_generated))
 
+$(eval $(call gb_Library_add_linked_libs,index_data,\
+    $(gb_STDLIBS) \
+))
+
 $(eval $(call gb_Library_add_generated_exception_objects,index_data,\
 	$(subst $(WORKDIR)/,,$(basename $(wildcard $(WORKDIR)/CustomTarget/i18npool/source/indexentry/*.cxx))) \
 ))
diff --git a/i18npool/Library_localedata_en.mk b/i18npool/Library_localedata_en.mk
index 2a09257b483c..89534ed2d176 100644
--- a/i18npool/Library_localedata_en.mk
+++ b/i18npool/Library_localedata_en.mk
@@ -30,6 +30,10 @@ $(eval $(call gb_Library_Library,localedata_en))
 
 $(eval $(call gb_Library_add_package_headers,localedata_en,i18npool_generated))
 
+$(eval $(call gb_Library_add_linked_libs,localedata_en,\
+    $(gb_STDLIBS) \
+))
+
 $(eval $(call gb_Library_add_generated_exception_objects,localedata_en,\
 	CustomTarget/i18npool/source/localedata/localedata_en_AU \
 	CustomTarget/i18npool/source/localedata/localedata_en_BZ \
diff --git a/i18npool/Library_localedata_es.mk b/i18npool/Library_localedata_es.mk
index c429fc8e77d9..a15db63cf167 100644
--- a/i18npool/Library_localedata_es.mk
+++ b/i18npool/Library_localedata_es.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Library_Library,localedata_es))
 
 $(eval $(call gb_Library_add_linked_libs,localedata_es,\
 	localedata_en \
+    $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_add_generated_exception_objects,localedata_es,\
diff --git a/i18npool/Library_localedata_euro.mk b/i18npool/Library_localedata_euro.mk
index fecdcec48785..d879dc22ff77 100644
--- a/i18npool/Library_localedata_euro.mk
+++ b/i18npool/Library_localedata_euro.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Library_Library,localedata_euro))
 
 $(eval $(call gb_Library_add_linked_libs,localedata_euro,\
 	localedata_en \
+    $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_add_generated_exception_objects,localedata_euro,\
diff --git a/i18npool/Library_localedata_others.mk b/i18npool/Library_localedata_others.mk
index a4c5bc7d9ebb..6ab62a59bec8 100644
--- a/i18npool/Library_localedata_others.mk
+++ b/i18npool/Library_localedata_others.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Library_Library,localedata_others))
 
 $(eval $(call gb_Library_add_linked_libs,localedata_others,\
 	localedata_en \
+    $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_add_generated_exception_objects,localedata_others,\
diff --git a/i18npool/Library_textconv_dict.mk b/i18npool/Library_textconv_dict.mk
index 3b9213c32710..45ae317cea57 100644
--- a/i18npool/Library_textconv_dict.mk
+++ b/i18npool/Library_textconv_dict.mk
@@ -40,6 +40,10 @@ $(eval $(call gb_Library_add_api,textconv_dict,\
 	offapi \
 ))
 
+$(eval $(call gb_Library_add_linked_libs,textconv_dict,\
+    $(gb_STDLIBS) \
+))
+
 $(eval $(call gb_Library_add_generated_exception_objects,textconv_dict,\
 	$(subst $(WORKDIR)/,,$(basename $(wildcard $(WORKDIR)/CustomTarget/i18npool/source/textconversion/*.cxx))) \
 ))