runqueue.py: Enhance add_xxx_dependencies to return the fnid it resolved to

index c45287d..0621e9e 100644
@@ -399,6 +399,7 @@ class RunQueueData:
         # rdeptast, recrdeptask, idepends).
 
         def add_build_dependencies(depids, tasknames, depends):
+            fnids = []
             for depid in depids:
                 # Won't be in build_targets if ASSUME_PROVIDED
                 if depid not in taskData.build_targets:

@@ -406,22 +407,27 @@ class RunQueueData:
                 depdata = taskData.build_targets[depid][0]
                 if depdata is None:
                     continue
+                fnids.append(depdata)
                 for taskname in tasknames:
                     taskid = taskData.gettask_id_fromfnid(depdata, taskname)
                     if taskid is not None:
                         depends.add(taskid)
+            return fnids
 
         def add_runtime_dependencies(depids, tasknames, depends):
+            fnids = []
             for depid in depids:
                 if depid not in taskData.run_targets:
                     continue
                 depdata = taskData.run_targets[depid][0]
                 if depdata is None:
                     continue
+                fnids.append(depdata)
                 for taskname in tasknames:
                     taskid = taskData.gettask_id_fromfnid(depdata, taskname)
                     if taskid is not None:
                         depends.add(taskid)
+            return fnids
 
         for task in xrange(len(taskData.tasks_name)):
             depends = set()