gbuild: replace direct gb_STDLIBS use with ...

... new gb_LinkTarget_add_standard_system_libs

Change-Id: Ib2bc843098db3d8c6822b45a3d21724e67f57d69

10 files changed, 20 insertions, 10 deletions

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 5de9b9320c25..ee844de24330 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -341,6 +341,7 @@ $(eval $(foreach method,\
 	add_ldflags \
 	set_ldflags \
 	add_libs \
+	add_standard_system_libs \
 	use_sdk_api \
 	use_udk_api \
 	use_internal_api \
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index db901f079512..1ddedfdad41b 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -105,6 +105,7 @@ $(eval $(foreach method,\
 	add_ldflags \
 	set_ldflags \
 	add_libs \
+	add_standard_system_libs \
 	set_library_path_flags \
 	add_api \
 	use_api \
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 01ee922935ae..10ca542b58c5 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -185,6 +185,7 @@ $(eval $(foreach method,\
 	set_ldflags \
 	set_x64 \
 	add_libs \
+	add_standard_system_libs \
 	set_library_path_flags \
 	add_api \
 	use_api \
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 8dddeb390402..5b953005ef24 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -648,6 +648,13 @@ define gb_LinkTarget_add_libs
 $(call gb_LinkTarget_get_target,$(1)) : LIBS += $(2)
 endef
 
+# add platform specific standard libraries to linker command for linktarget $(1)
+# there are currently 94 Libraries/Executables/CppunitTests not using
+# gb_STDLIBS... probably this should need to be added explicitly
+define gb_LinkTarget_add_standard_system_libs
+$(call gb_LinkTarget_get_target,$(1)) : LIBS += $(gb_STDLIBS)
+endef
+
 define gb_LinkTarget_add_api
 $$(call gb_Output_error,\
  gb_LinkTarget_add_api: use gb_LinkTarget_use_api instead.)
diff --git a/solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk b/solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk
index acebb04da5e6..50267d307251 100644
--- a/solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk
@@ -29,7 +29,7 @@
 
 gb_CPUDEFS := -DX86
 gb_COMPILERDEFAULTOPTFLAGS := -O2
-gb_STDLIBS := pthread
+gb_STDLIBS := $(PTHREAD_LIBS)
 
 include $(GBUILDDIR)/platform/unxgcc.mk
 
diff --git a/solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk b/solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk
index 5eaa617bd6b3..34f35a36f7fd 100644
--- a/solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk
+++ b/solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk
@@ -28,7 +28,7 @@
 #please make generic modifications to unxgcc.mk
 
 gb_COMPILERDEFAULTOPTFLAGS := -O2
-gb_STDLIBS := pthread
+gb_STDLIBS := $(PTHREAD_LIBS)
 
 include $(GBUILDDIR)/platform/unxgcc.mk
 
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index a59782c6dd75..d2e53537d2e9 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -107,9 +107,9 @@ gb_LinkTarget_LDFLAGS += -shared-libgcc
 endif
 
 gb_STDLIBS := \
-	mingwthrd \
-	mingw32 \
-	mingwex \
+	-lmingwthrd \
+	-lmingw32 \
+	-lmingwex \
 
 
 # LinkTarget class
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 9deca874330a..739427e65659 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -188,7 +188,7 @@ gb_CXXFLAGS := \
 	-Zm500 \
 
 gb_STDLIBS := \
-	advapi32 \
+	advapi32.lib \
 
 ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
 gb_CFLAGS_WERROR := -WX -DLIBO_WERROR
diff --git a/solenv/gbuild/platform/android.mk b/solenv/gbuild/platform/android.mk
index cb071aee1865..f32fcc5bcb3e 100644
--- a/solenv/gbuild/platform/android.mk
+++ b/solenv/gbuild/platform/android.mk
@@ -9,7 +9,7 @@
 
 # Link almost everything with -lgnustl_shared
 gb_STDLIBS := \
-	gnustl_shared
+	-lgnustl_shared \
 
 gb_Library_PLAINLIBS_NONE := \
 	android \
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 6c77d71247f0..be54115de350 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -237,9 +237,9 @@ gb_Library_OOOEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_PLAINEXT)
 gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
 
 gb_STDLIBS := \
-	m \
-	nsl \
-	socket \
+	-lm \
+	-lnsl \
+	-lsocket \
 
 gb_Library_PLAINLIBS_NONE += \
 	dl \