tequilaOS/platform_build_blueprint
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move cgofilter to be built by bootstrap.ninja

Browse source 
Building cgofilter from main.ninja creates a circular dependency.
Move it to be built by the bootstrap stage instead, where go
files are built without cgofilter.

Change-Id: I853eb0b20a364adbfb93d44b039e1493214a6887
This commit is contained in:
Colin Cross 2014-10-22 15:54:20 -07:00
parent add65dd4c1
commit 535434a59d
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
blueprint/bootstrap/bootstrap.go
View file

@ -93,8 +93,8 @@ var (
},
"depfile")
binDir = filepath.Join(bootstrapDir, "bin")
minibpFile = filepath.Join(binDir, "minibp")
BinDir = filepath.Join(bootstrapDir, "bin")
minibpFile = filepath.Join(BinDir, "minibp")
)
type goPackageProducer interface {
@ -211,7 +211,7 @@ func (g *goBinary) GenerateBuildActions(ctx blueprint.ModuleContext) {
objDir = objDir(ctx)
archiveFile = filepath.Join(objDir, name+".a")
aoutFile = filepath.Join(objDir, "a.out")
binaryFile = filepath.Join(binDir, name)
binaryFile = filepath.Join(BinDir, name)
)
// We only actually want to build the builder modules if we're running as
@ -341,9 +341,13 @@ func (s *singleton) GenerateBuildActions(ctx blueprint.SingletonContext) {
// creating the binary that we'll use to generate the non-bootstrap
// build.ninja file.
var primaryBuilders []*goBinary
var allGoBinaries []string
ctx.VisitAllModulesIf(isBootstrapBinaryModule,
func(module blueprint.Module) {
binaryModule := module.(*goBinary)
binaryModuleName := ctx.ModuleName(binaryModule)
binaryModulePath := filepath.Join(BinDir, binaryModuleName)
allGoBinaries = append(allGoBinaries, binaryModulePath)
if binaryModule.properties.PrimaryBuilder {
primaryBuilders = append(primaryBuilders, binaryModule)
}
@ -370,7 +374,7 @@ func (s *singleton) GenerateBuildActions(ctx blueprint.SingletonContext) {
return
}
primaryBuilderFile := filepath.Join(binDir, primaryBuilderName)
primaryBuilderFile := filepath.Join(BinDir, primaryBuilderName)
// Get the filename of the top-level Blueprints file to pass to minibp.
// This comes stored in a global variable that's set by Main.
@ -412,7 +416,7 @@ func (s *singleton) GenerateBuildActions(ctx blueprint.SingletonContext) {
Rule: bigbp,
Outputs: []string{mainNinjaFile},
Inputs: []string{topLevelBlueprints},
Implicits: []string{primaryBuilderFile},
Implicits: allGoBinaries,
})
// When the current build.ninja file is a bootstrapper, we always want