ruleset.go -> rules.go

This commit is contained in:
Daniel Jones 2013-03-03 23:32:36 -08:00
parent 467d1d3d44
commit 034b895b15
2 changed files with 2 additions and 3 deletions

5
mk.go
View file

@ -72,7 +72,7 @@ func mkNode(g *graph, u *node) {
// there's no fucking rules, dude
if len(u.prereqs) == 0 {
if !u.r.attributes.virtual && !u.exists {
if !(u.r != nil && u.r.attributes.virtual) && !u.exists {
wd, _ := os.Getwd()
mkError(fmt.Sprintf("don't know how to make %s in %s", u.name, wd))
}
@ -134,8 +134,7 @@ func mkNode(g *graph, u *node) {
}
// execute the recipe, unless the prereqs failed
if finalstatus != nodeStatusFailed {
//mkPrintMessage("mking " + u.name)
if finalstatus != nodeStatusFailed && len(e.r.recipe) > 0 {
if !dorecipe(u.name, u, e) {
finalstatus = nodeStatusFailed
}