[C++] Honor "override" when setting global variable

Regression when compared to GNU make behaviour.

Test case:

 $ cat Makefile.override-failure
 $(info VAR: '$(VAR)')
 override VAR := test
 $(info VAR: '$(VAR)')
 override VAR := test-new
 $(info VAR: '$(VAR)')
 VAR := test-should-not-work
 $(info VAR: '$(VAR)')

 $ make -f Makefile.override-failure
 VAR: ''
 VAR: 'test'
 VAR: 'test-new'
 VAR: 'test-new'
 make: *** No targets.  Stop.

 $ ckati -c --warn -f Makefile.override-failure
 VAR: ''
 VAR: 'test'
 VAR: 'test'
 VAR: 'test'
 *** No targets.

Fixes https://github.com/google/kati/issues/50

Change-Id: I9c4185c30cfcf5602da7e0ac98b7e9c420788005

1 files changed, 2 insertions, 1 deletions

diff --git a/eval.cc b/eval.cc
index 6322fc1..bc27af9 100644
--- a/eval.cc
+++ b/eval.cc
@@ -101,7 +101,8 @@ void Evaluator::EvalAssign(const AssignStmt* stmt) {
   Var* rhs = EvalRHS(lhs, stmt->rhs, stmt->orig_rhs, stmt->op,
                      stmt->directive == AssignDirective::OVERRIDE);
   if (rhs)
-    lhs.SetGlobalVar(rhs);
+    lhs.SetGlobalVar(rhs,
+                     stmt->directive == AssignDirective::OVERRIDE);
 }
 
 void Evaluator::EvalRule(const RuleStmt* stmt) {