summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-04-21 18:29:51 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-04-21 18:30:43 +0200
commit9c028fe3ff8b5db3f367d19d4fc9f99470a0d13d (patch)
treec430af3d5aad8fd71ef621a1c1c3b9b594ab5e56
parent3e457472230a8257abcdec3c041c6ed2e9bd53b4 (diff)
enable CHECKOBJECTOWNER by default now, warn instead of error
-rw-r--r--solenv/gbuild/extensions/final_ObjectOwner.mk2
-rw-r--r--solenv/gbuild/gbuild.mk2
2 files changed, 3 insertions, 1 deletions
diff --git a/solenv/gbuild/extensions/final_ObjectOwner.mk b/solenv/gbuild/extensions/final_ObjectOwner.mk
index c00dcb897..f66a7a2e8 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 f9753debc..61055f98b 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)