From 5032dc0fc339ba6b200e80a5482cc86e00662a0b Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 28 Sep 2012 16:29:24 +0200 Subject: gbuild: invert handling of standard system libraries: Always link in gb_STDLIBS, except when the library explicitly opts out with gb_LinkTarget_disable_standard_system_libs. Change-Id: I489a99114fbfa46d0421a27cf6c7b899dc268a4a --- stoc/Library_bootstrap.mk | 2 -- stoc/Library_introspection.mk | 2 -- stoc/Library_invocadapt.mk | 2 -- stoc/Library_invocation.mk | 2 -- stoc/Library_javaloader.mk | 2 -- stoc/Library_javavm.mk | 2 -- stoc/Library_namingservice.mk | 2 -- stoc/Library_proxyfac.mk | 2 -- stoc/Library_reflection.mk | 2 -- stoc/Library_stocservices.mk | 2 -- 10 files changed, 20 deletions(-) (limited to 'stoc') diff --git a/stoc/Library_bootstrap.mk b/stoc/Library_bootstrap.mk index 46d72b7633d9..a7576114f947 100644 --- a/stoc/Library_bootstrap.mk +++ b/stoc/Library_bootstrap.mk @@ -56,8 +56,6 @@ $(eval $(call gb_Library_use_libraries,bootstrap,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,bootstrap)) - $(eval $(call gb_Library_set_componentfile,bootstrap,stoc/util/bootstrap)) $(eval $(call gb_Library_add_exception_objects,bootstrap,\ diff --git a/stoc/Library_introspection.mk b/stoc/Library_introspection.mk index a1e058c86304..be2eaf6711e2 100644 --- a/stoc/Library_introspection.mk +++ b/stoc/Library_introspection.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Library_use_libraries,introspection,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,introspection)) - $(eval $(call gb_Library_set_componentfile,introspection,stoc/source/inspect/introspection)) $(eval $(call gb_Library_add_exception_objects,introspection,\ diff --git a/stoc/Library_invocadapt.mk b/stoc/Library_invocadapt.mk index 7fe31573d480..81165cd9fc40 100644 --- a/stoc/Library_invocadapt.mk +++ b/stoc/Library_invocadapt.mk @@ -36,8 +36,6 @@ $(eval $(call gb_Library_use_libraries,invocadapt,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,invocadapt)) - $(eval $(call gb_Library_set_componentfile,invocadapt,stoc/source/invocation_adapterfactory/invocadapt)) $(eval $(call gb_Library_add_exception_objects,invocadapt,\ diff --git a/stoc/Library_invocation.mk b/stoc/Library_invocation.mk index b2544c77372b..e5970024345d 100644 --- a/stoc/Library_invocation.mk +++ b/stoc/Library_invocation.mk @@ -36,8 +36,6 @@ $(eval $(call gb_Library_use_libraries,invocation,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,invocation)) - $(eval $(call gb_Library_set_componentfile,invocation,stoc/source/invocation/invocation)) $(eval $(call gb_Library_add_exception_objects,invocation,\ diff --git a/stoc/Library_javaloader.mk b/stoc/Library_javaloader.mk index 2303d92c0195..d30ccd1cdf15 100644 --- a/stoc/Library_javaloader.mk +++ b/stoc/Library_javaloader.mk @@ -38,8 +38,6 @@ $(eval $(call gb_Library_use_libraries,javaloader,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,javaloader)) - $(eval $(call gb_Library_set_componentfile,javaloader,stoc/source/javaloader/javaloader)) $(eval $(call gb_Library_add_exception_objects,javaloader,\ diff --git a/stoc/Library_javavm.mk b/stoc/Library_javavm.mk index a0fc87853263..78d018cf9cc3 100644 --- a/stoc/Library_javavm.mk +++ b/stoc/Library_javavm.mk @@ -39,8 +39,6 @@ $(eval $(call gb_Library_use_libraries,javavm,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,javavm)) - $(eval $(call gb_Library_set_componentfile,javavm,stoc/source/javavm/javavm)) $(eval $(call gb_Library_add_exception_objects,javavm,\ diff --git a/stoc/Library_namingservice.mk b/stoc/Library_namingservice.mk index ed115ed30c42..0b049f5aefa3 100644 --- a/stoc/Library_namingservice.mk +++ b/stoc/Library_namingservice.mk @@ -36,8 +36,6 @@ $(eval $(call gb_Library_use_libraries,namingservice,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,namingservice)) - $(eval $(call gb_Library_set_componentfile,namingservice,stoc/source/namingservice/namingservice)) $(eval $(call gb_Library_add_exception_objects,namingservice,\ diff --git a/stoc/Library_proxyfac.mk b/stoc/Library_proxyfac.mk index 8eb08e55265d..75166f0f6809 100644 --- a/stoc/Library_proxyfac.mk +++ b/stoc/Library_proxyfac.mk @@ -36,8 +36,6 @@ $(eval $(call gb_Library_use_libraries,proxyfac,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,proxyfac)) - $(eval $(call gb_Library_set_componentfile,proxyfac,stoc/source/proxy_factory/proxyfac)) $(eval $(call gb_Library_add_exception_objects,proxyfac,\ diff --git a/stoc/Library_reflection.mk b/stoc/Library_reflection.mk index aa5198a84bdd..71fd2cdbc81f 100644 --- a/stoc/Library_reflection.mk +++ b/stoc/Library_reflection.mk @@ -36,8 +36,6 @@ $(eval $(call gb_Library_use_libraries,reflection,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,reflection)) - $(eval $(call gb_Library_set_componentfile,reflection,stoc/source/corereflection/reflection)) $(eval $(call gb_Library_add_exception_objects,reflection,\ diff --git a/stoc/Library_stocservices.mk b/stoc/Library_stocservices.mk index 2a8b7b8f31e5..3da842d80946 100644 --- a/stoc/Library_stocservices.mk +++ b/stoc/Library_stocservices.mk @@ -41,8 +41,6 @@ $(eval $(call gb_Library_use_libraries,stocservices,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,stocservices)) - $(eval $(call gb_Library_set_componentfile,stocservices,stoc/util/stocservices)) $(eval $(call gb_Library_add_exception_objects,stocservices,\ -- cgit