[rtems-libbsd commit] wscript: Python2 support for unicode strings in contexts

[Chris Johns]

Module:    rtems-libbsd
Branch:    5-freebsd-12
Commit:    236295c67ed0e2ae5d98cf3bbbe253b4a311e8af
Changeset: http://git.rtems.org/rtems-libbsd/commit/?id=236295c67ed0e2ae5d98cf3bbbe253b4a311e8af

Author:    Vijay Kumar Banerjee <vijay at rtems.org>
Date:      Sun Mar 29 03:47:10 2020 +0530

wscript: Python2 support for unicode strings in contexts

Closes #3909

---

 wscript | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/wscript b/wscript
index e0a7e9f..3ca9478 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):