Prevent possible race when building target twice

[goredo.git] / ifchange.go

diff --git a/ifchange.go b/ifchange.go
index dc5b9dafba8ecb6fe1284760886d510faff3f218..401574de816b8ef06d7af2c2210917326823807d 100644 (file)
--- a/ifchange.go
+++ b/ifchange.go
@@ -98,7 +98,7 @@ func buildDependants(tgts []string) map[string]struct{} {
                }
        }
        if len(seen) == 0 {
-               return nil
+               return seen
        }
 
        levelOrig := Level
@@ -109,7 +109,7 @@ func buildDependants(tgts []string) map[string]struct{} {
        tracef(CDebug, "building %d alwayses: %v", len(seen), seen)
        errs := make(chan error, len(seen))
        for tgt := range seen {
-               if err := runScript(tgt, errs, false); err != nil {
+               if err := runScript(tgt, errs, false, false); err != nil {
                        tracef(CErr, "always run error: %s, skipping dependants", err)
                        return nil
                }
@@ -135,17 +135,18 @@ func buildDependants(tgts []string) map[string]struct{} {
 
 RebuildDeps:
        tracef(CDebug, "checking %d dependant targets: %v", len(queueSrc), queueSrc)
-       queue := []string{}
+       queue := map[string]struct{}{}
        for _, tgt := range queueSrc {
                for dep := range deps[tgt] {
-                       queue = append(queue, dep)
+                       queue[dep] = struct{}{}
                }
        }
+
        tracef(CDebug, "building %d dependant targets: %v", len(queue), queue)
        errs = make(chan error, len(queue))
        jobs := 0
        queueSrc = []string{}
-       for _, tgt := range queue {
+       for tgt := range queue {
                ood, err := isOODWithTrace(Cwd, tgt, 0, seen)
                if err != nil {
                        tracef(CErr, "dependant error: %s, skipping dependants", err)
@@ -154,7 +155,7 @@ RebuildDeps:
                if !ood {
                        continue
                }
-               if err := runScript(tgt, errs, false); err != nil {
+               if err := runScript(tgt, errs, false, false); err != nil {
                        tracef(CErr, "dependant error: %s, skipping dependants", err)
                        return nil
                }
@@ -196,6 +197,9 @@ func ifchange(tgts []string, forced, traced bool) (bool, error) {
        }
        defer Jobs.Wait()
        seen := buildDependants(tgts)
+       if seen == nil {
+               return false, nil
+       }
        oodTgtsClear()
        tracef(CDebug, "building %d targets: %v", len(tgts), tgts)
        jobs := 0
@@ -221,7 +225,7 @@ func ifchange(tgts []string, forced, traced bool) (bool, error) {
                        tracef(CDebug, "%s is source, not redoing", tgt)
                        continue
                }
-               if err = runScript(tgt, errs, traced); err != nil {
+               if err = runScript(tgt, errs, forced, traced); err != nil {
                        return false, err
                }
                jobs++