wscript: Python2 support for unicode strings in contexts

Update #3909

1 files changed, 4 insertions, 4 deletions

diff --git a/wscript b/wscript
index e0a7e9f7..3ca9478e 100644
--- a/wscript
+++ b/wscript
@@ -144,8 +144,8 @@ def bsp_init(ctx, env, contexts):
             newcmd = y.cmd + '-' + builder
             newvariant = y.variant + '-' + builder
             class context(y):
-                cmd = newcmd
-                variant = newvariant
+                cmd = str(newcmd)
+                variant = str(newvariant)
                 libbsd_buildset_name = builder
 
     # Transform the commands to per build variant commands
@@ -153,9 +153,9 @@ def bsp_init(ctx, env, contexts):
     for cmd in waflib.Options.commands:
         if cmd.startswith(('build', 'clean', 'install')):
             for builder in builders:
-                commands += [cmd + '-' + builder]
+                commands += [str(cmd + '-' + builder)]
         else:
-            commands += [cmd]
+            commands += [str(cmd)]
     waflib.Options.commands = commands
 
 def init(ctx):