From 4c15a77f27204620ed35d97d75e521ca982e1cc5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Fonseca?= Date: Sun, 29 Apr 2012 21:44:05 +0100 Subject: [PATCH] scons: Parse = operator in source lists too. Should fix the scons build. --- scons/source_list.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/scons/source_list.py b/scons/source_list.py index fbd3ef7dc17..1d5166ba1fe 100644 --- a/scons/source_list.py +++ b/scons/source_list.py @@ -3,7 +3,7 @@ The syntax of a source list file is a very small subset of GNU Make. These features are supported - operators: +=, := + operators: =, +=, := line continuation non-nested variable expansion comment @@ -62,17 +62,18 @@ class SourceListParser(object): if op_pos < 0: self._error('not a variable definition') - if op_pos > 0 and line[op_pos - 1] in [':', '+']: - op_pos -= 1 + if op_pos > 0: + if line[op_pos - 1] in [':', '+']: + op_pos -= 1 else: - self._error('only := and += are supported') + self._error('only =, :=, and += are supported') # set op, sym, and val op = line[op_pos:op_end] sym = line[:op_pos].strip() val = self._expand_value(line[op_end:].lstrip()) - if op == ':=': + if op in ('=', ':='): self.symbol_table[sym] = val elif op == '+=': self.symbol_table[sym] += ' ' + val -- 2.30.2