diff options
| -rw-r--r-- | scons/crossmingw.py | 4 | ||||
| -rw-r--r-- | scons/custom.py | 8 | ||||
| -rwxr-xr-x | scons/gallium.py | 2 |
3 files changed, 9 insertions, 5 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'] diff --git a/scons/custom.py b/scons/custom.py index 8028990ef61..2fad8f5b6d4 100644 --- a/scons/custom.py +++ b/scons/custom.py @@ -262,8 +262,12 @@ def parse_source_list(env, filename, names=None): sym_table = parser.parse(src.abspath) if names: - if isinstance(names, basestring): - names = [names] + if sys.version_info[0] >= 3: + if isinstance(names, str): + names = [names] + else: + if isinstance(names, basestring): + names = [names] symbols = names else: diff --git a/scons/gallium.py b/scons/gallium.py index 3bc0b8d7324..3c59010c768 100755 --- a/scons/gallium.py +++ b/scons/gallium.py @@ -132,7 +132,7 @@ def check_cc(env, cc, expr, cpp_opt = '-E'): sys.stdout.write('Checking for %s ... ' % cc) source = tempfile.NamedTemporaryFile(suffix='.c', delete=False) - source.write('#if !(%s)\n#error\n#endif\n' % expr) + source.write(('#if !(%s)\n#error\n#endif\n' % expr).encode()) source.close() # sys.stderr.write('%r %s %s\n' % (env['CC'], cpp_opt, source.name)); |