aboutsummaryrefslogtreecommitdiffstats
path: root/eval.cc
diff options
context:
space:
mode:
authorShinichiro Hamaji <shinichiro.hamaji@gmail.com>2015-06-24 16:53:44 +0900
committerShinichiro Hamaji <shinichiro.hamaji@gmail.com>2015-06-25 17:51:01 +0900
commit5e3e3d24fddf00d3f326513c25a6e8ab77b6e440 (patch)
tree33ba1561cb379f5b2a0c9f110762e4178b3faf64 /eval.cc
parentdca79a34940613f8978e92638278344b863a3f17 (diff)
downloadandroid_build_kati-5e3e3d24fddf00d3f326513c25a6e8ab77b6e440.tar.gz
android_build_kati-5e3e3d24fddf00d3f326513c25a6e8ab77b6e440.tar.bz2
android_build_kati-5e3e3d24fddf00d3f326513c25a6e8ab77b6e440.zip
[C++] Fix target_specific_var_in_var.mk
Diffstat (limited to 'eval.cc')
-rw-r--r--eval.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/eval.cc b/eval.cc
index ab99a01..de49297 100644
--- a/eval.cc
+++ b/eval.cc
@@ -134,7 +134,13 @@ void Evaluator::EvalRule(const RuleAST* ast) {
if (!rule_var.rhs.empty()) {
Value* lit = NewLiteral(rule_var.rhs);
if (rhs) {
- rhs = NewExpr2(lit, rhs);
+ // TODO: We always insert two whitespaces around the
+ // terminator. Preserve whitespaces properly.
+ if (ast->term == ';') {
+ rhs = NewExpr3(lit, NewLiteral(STRING_PIECE(" ; ")), rhs);
+ } else {
+ rhs = NewExpr3(lit, NewLiteral(STRING_PIECE(" = ")), rhs);
+ }
} else {
rhs = lit;
}