Commit b07d4740 authored by jan.koester's avatar jan.koester
Browse files

test

parent 791886c6

parser.cpp

+4 −7
Changes for parser.cpp: 4 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -950,13 +950,10 @@ bool Parser::try_parse_rule(const std::string& line, Makefile& mf, Rule*& curren 
                for (auto& pr : vec) {

                    if (pr.name == tv_name) {

                        if (tv_op == "+=") {

                            // Appending to an already expanded ':=' binding:

                            // keep the merged text unexpanded-safe.

                            if (!pr.recursive) {

                                pr.value = escape_dollars(pr.value);

                                pr.recursive = true;

                            }

                            pr.value = pr.value.empty() ? val : pr.value + " " + val;

                            // Appending to a ':=' binding expands the new

                            // text now and keeps the binding simple (GNU).

                            std::string add = pr.recursive ? val : expand(val, mf);

                            pr.value = pr.value.empty() ? add : pr.value + " " + add;

                        } else {

                            pr.value = val;

                            pr.append = false;