diff options
| author | marha <marha@users.sourceforge.net> | 2012-04-30 11:11:16 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-04-30 11:11:16 +0200 |
| commit | 0f0386d4e90cb0769eddc04b18742d5a9a72ea05 (patch) | |
| tree | a8a5fb11e78c4afe6637c5adfa0d2224208f7314 /mesalib/scons | |
| parent | cd27f58626705bcb561115b8e5b0d1430df83fa6 (diff) | |
| parent | 762b7fde3d57d3a151f98535fd31516b7e823bc0 (diff) | |
| download | vcxsrv-0f0386d4e90cb0769eddc04b18742d5a9a72ea05.tar.gz vcxsrv-0f0386d4e90cb0769eddc04b18742d5a9a72ea05.tar.bz2 vcxsrv-0f0386d4e90cb0769eddc04b18742d5a9a72ea05.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
pixman/pixman/pixman-mmx.c
xorg-server/glx/glapi_gentable.c
Diffstat (limited to 'mesalib/scons')
| -rw-r--r-- | mesalib/scons/source_list.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/mesalib/scons/source_list.py b/mesalib/scons/source_list.py index fbd3ef7dc..1d5166ba1 100644 --- a/mesalib/scons/source_list.py +++ b/mesalib/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 |