Merge pull request #225 from colincross/test_link_deps
Add missing dependencies when linking tests
diff --git a/bootstrap/bootstrap.go b/bootstrap/bootstrap.go
index 39958cc..be156f9 100644
--- a/bootstrap/bootstrap.go
+++ b/bootstrap/bootstrap.go
@@ -561,11 +561,13 @@
Optional: true,
})
+ var linkDeps []string
libDirFlags := []string{"-L " + testRoot}
testDeps := []string{}
ctx.VisitDepsDepthFirstIf(isGoPackageProducer,
func(module blueprint.Module) {
dep := module.(goPackageProducer)
+ linkDeps = append(linkDeps, dep.GoPackageTarget())
libDir := dep.GoPkgRoot()
libDirFlags = append(libDirFlags, "-L "+libDir)
testDeps = append(testDeps, dep.GoTestTargets()...)
@@ -584,9 +586,10 @@
})
ctx.Build(pctx, blueprint.BuildParams{
- Rule: link,
- Outputs: []string{testFile},
- Inputs: []string{testArchive},
+ Rule: link,
+ Outputs: []string{testFile},
+ Inputs: []string{testArchive},
+ Implicits: linkDeps,
Args: map[string]string{
"libDirFlags": strings.Join(libDirFlags, " "),
},