114,115c114,119
< # M5 includes
< sys.path[1:1] = [ Dir('src/python').srcnode().abspath ]
---
> extra_python_paths = [
> Dir('src/python').srcnode().abspath, # M5 includes
> Dir('ext/ply').srcnode().abspath, # ply is used by several files
> ]
>
> sys.path[1:1] = extra_python_paths
125c129
< 'RANLIB' ])
---
> 'PYTHONPATH', 'RANLIB' ])
135a140,143
> # add useful python code PYTHONPATH so it can be used by subprocesses
> # as well
> main.AppendENVPath('PYTHONPATH', extra_python_paths)
>
341,343d348
< # M5_PLY is used by isa_parser.py to find the PLY package.
< main.Append(ENV = { 'M5_PLY' : Dir('ext/ply').abspath })
<
389c394
< main.Append(CCFLAGS=Split("-Wno-uninitialized"))
---
> main.Append(CCFLAGS="-Wno-uninitialized")