[Libreoffice-commits] .: solenv/gbuild

[Bjoern Michaelsen]

 solenv/gbuild/extensions/final_ObjectOwner.mk |    2 +-
 solenv/gbuild/gbuild.mk                       |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 9c028fe3ff8b5db3f367d19d4fc9f99470a0d13d
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Thu Apr 21 18:29:51 2011 +0200

    enable CHECKOBJECTOWNER by default now, warn instead of error

diff --git a/solenv/gbuild/extensions/final_ObjectOwner.mk b/solenv/gbuild/extensions/final_ObjectOwner.mk
index c00dcb8..f66a7a2 100644
--- a/solenv/gbuild/extensions/final_ObjectOwner.mk
+++ b/solenv/gbuild/extensions/final_ObjectOwner.mk
@@ -40,7 +40,7 @@ endef
 gb_CHECKOBJECTOWNER_VALID := $(true)
 $(foreach object,$(sort $(gb_LinkTarget_OBJECTS)),$(eval $(call gb_LinkTarget_check_object_owner,$(object))))
 ifneq ($(gb_CHECKOBJECTOWNER_VALID),$(true))
-$(eval $(call gb_Output_error,duplicate linked objects))
+$(eval $(call gb_Output_warn,duplicate linked objects))
 endif
 
 endif
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index f9753de..61055f9 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -116,6 +116,8 @@ else
 gb_FULLDEPS := $(true)
 endif
 
+gb_CHECKOBJECTOWNER := $(true)
+
 # save user-supplied flags for latter use
 ifneq ($(strip $(CFLAGS)),)
 gb__ENV_CFLAGS := $(CFLAGS)