summaryrefslogtreecommitdiff
path: root/scons/crossmingw.py
diff options
context:
space:
mode:
authorMichel Zou <xantares09@hotmail.com>2019-09-28 08:53:38 +0200
committerEric Engestrom <eric@engestrom.ch>2019-09-28 16:53:08 +0000
commit3f92d17894bedf2da6aabe017004391b91a5e860 (patch)
treeb4abb93ff5f8b10b7d5ce75e639779967c5bc13a /scons/crossmingw.py
parent411e50a8fd0301067f2a67732dbf432177019704 (diff)
scons: add py3 support
SCons 3.1 has moved to python 3, requiring this fix to continue supporting scons builds. Closes: #944 Cc: mesa-stable@lists.freedesktop.org Acked-by: Eric Engestrom <eric@engestrom.ch> Tested-by: Eric Engestrom <eric@engestrom.ch>
Diffstat (limited to 'scons/crossmingw.py')
-rw-r--r--scons/crossmingw.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/scons/crossmingw.py b/scons/crossmingw.py
index 609cd00418e..b2efccea7e8 100644
--- a/scons/crossmingw.py
+++ b/scons/crossmingw.py
@@ -128,9 +128,9 @@ def generate(env):
if not path:
path = []
if SCons.Util.is_String(path):
- path = string.split(path, os.pathsep)
+ path = str.split(path, os.pathsep)
- env['ENV']['PATH'] = string.join([dir] + path, os.pathsep)
+ env['ENV']['PATH'] = str.join(os.pathsep, [dir] + path)
# Most of mingw is the same as gcc and friends...
gnu_tools = ['gcc', 'g++', 'gnulink', 'ar', 'gas']