Commit 40fcdda6 authored by jan.koester's avatar jan.koester
Browse files

test

parent 49e2382d

executor.cpp

+4 −2
Changes for executor.cpp: 4 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -276,7 +276,9 @@ std::vector<std::string> Executor::expand_prereqs(const std::string& target, 
        }

    };



    // Collect prerequisites from the chosen rule.

    // Collect prerequisites from the chosen rule; a double-colon target's

    // rules are all equal, so keep them in makefile order (loop below).

    if (!rule->double_colon)

        add_prereqs(rule, rule->is_pattern || !rule->target_pattern.empty());



    // GNU Make merges prerequisites from all explicit rules for the same target.
@@ -285,7 +287,7 @@ std::vector<std::string> Executor::expand_prereqs(const std::string& target, 
    // other prerequisites (e.g. the object files to link) are never built.

    for (const auto& r : mf_.rules) {

        if (r.is_pattern) continue;

        if (&r == rule) continue;

        if (&r == rule && !rule->double_colon) continue;

        for (const auto& t : r.targets) {

            if (t == target) {

                add_prereqs(&r, false);