summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-03-09 08:17:26 +1100
committerAndrew Tridgell <tridge@samba.org>2010-04-06 20:26:47 +1000
commitc6e095de74b82bfaff689168fc4e1d86a0db56a4 (patch)
tree148b27a75d6aaebde13cde3acc18f92e9992a012
parente916aff9e1d44c3599c30b9ea32d03921f6403f4 (diff)
downloadsamba-c6e095de74b82bfaff689168fc4e1d86a0db56a4.tar.gz
samba-c6e095de74b82bfaff689168fc4e1d86a0db56a4.tar.bz2
samba-c6e095de74b82bfaff689168fc4e1d86a0db56a4.zip
build: assert on missing dependency
-rw-r--r--buildtools/wafsamba/samba_utils.py14
1 files changed, 13 insertions, 1 deletions
diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py
index 40a7536b4c..7a1d56e22a 100644
--- a/buildtools/wafsamba/samba_utils.py
+++ b/buildtools/wafsamba/samba_utils.py
@@ -168,8 +168,8 @@ def process_depends_on(self):
lst = self.to_list(self.depends_on)
for x in lst:
y = self.bld.name_to_obj(x, self.env)
+ self.bld.ASSERT(y is not None, "Failed to find dependency %s of %s" % (x, self.name))
y.post()
-
if getattr(y, 'more_includes', None):
self.includes += " " + y.more_includes
@@ -269,3 +269,15 @@ def ENFORCE_GROUP_ORDERING(bld):
t.post()
Build.BuildContext.ENFORCE_GROUP_ORDERING = ENFORCE_GROUP_ORDERING
+# @feature('cc')
+# @before('apply_lib_vars')
+# def process_objects(self):
+# if getattr(self, 'add_objects', None):
+# lst = self.to_list(self.add_objects)
+# for x in lst:
+# y = self.name_to_obj(x)
+# if not y:
+# raise Utils.WafError('object %r was not found in uselib_local (required by add_objects %r)' % (x, self.name))
+# y.post()
+# self.env.append_unique('INC_PATHS', y.env.INC_PATHS)
+