aboutsummaryrefslogtreecommitdiff
path: root/mesalib/scons/source_list.py
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-04-30 10:36:15 +0200
committermarha <marha@users.sourceforge.net>2012-04-30 10:36:15 +0200
commit762b7fde3d57d3a151f98535fd31516b7e823bc0 (patch)
tree11c32921b96808f2aab11a86863534fb28b274f6 /mesalib/scons/source_list.py
parentb68922d51f52ca6ab9daa0105ef5c57f35bfbdcf (diff)
downloadvcxsrv-762b7fde3d57d3a151f98535fd31516b7e823bc0.tar.gz
vcxsrv-762b7fde3d57d3a151f98535fd31516b7e823bc0.tar.bz2
vcxsrv-762b7fde3d57d3a151f98535fd31516b7e823bc0.zip
fontconfig libX11 libfontenc mesa pixman xserver git update 30 Apr 2012
Diffstat (limited to 'mesalib/scons/source_list.py')
-rw-r--r--mesalib/scons/source_list.py11
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