From 64263686cb6c09cdc8cf075f81a2fe111e36bf47 Mon Sep 17 00:00:00 2001 From: Daniel Jones Date: Fri, 29 Mar 2013 22:19:10 -0700 Subject: [PATCH] Fix false-positives when detecting ambiguous rules. --- graph.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/graph.go b/graph.go index 18bcd32..9fa13f0 100644 --- a/graph.go +++ b/graph.go @@ -315,7 +315,7 @@ func (g *graph) ambiguous(u *node) { if le == nil || le.r == nil { le = e } else { - if le.r.equivRecipe(e.r) { + if !le.r.equivRecipe(e.r) { if le.r.ismeta && !e.r.ismeta { mkPrintRecipe(u.name, le.r.recipe) le.togo = true @@ -326,9 +326,9 @@ func (g *graph) ambiguous(u *node) { continue } } - if le.r.equivRecipe(e.r) { + if !le.r.equivRecipe(e.r) { if bad == 0 { - mkPrintError(fmt.Sprintf("mk: ambiguous recipes for %sn", u.name)) + mkPrintError(fmt.Sprintf("mk: ambiguous recipes for %s\n", u.name)) bad = 1 g.trace(u.name, le) }