edksetup.bat stuck on unicode locale Windows

This issue happens under two conditions.
  1. Unicode language environment in Windows
  2. Python2 (Not reproducible with Python3)

Step to reproduce
  C:\edk2>edksetup.bat forcerebuild
The edksetup.bat stuck at 'nmake cleanall'.

Signed-off-by: Aiden Park <aiden.park@intel.com>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>

diff --git a/BaseTools/Source/C/Makefiles/NmakeSubdirs.py b/BaseTools/Source/C/Makefiles/NmakeSubdirs.py
index 356f5aca638eebf1366fb9279da478d053b48daa..9b699ea086e800cf90c0d6933a367a677f5a8507 100644 (file)
--- a/BaseTools/Source/C/Makefiles/NmakeSubdirs.py
+++ b/BaseTools/Source/C/Makefiles/NmakeSubdirs.py
@@ -38,7 +38,7 @@ def RunCommand(WorkDir=None, *Args, **kwargs):
     stdout, stderr = p.communicate()\r
     message = ""\r
     if stdout is not None:\r
     stdout, stderr = p.communicate()\r
     message = ""\r
     if stdout is not None:\r

-        message = stdout.decode(encoding='utf-8', errors='ignore') #for compatibility in python 2 and 3\r
+        message = stdout.decode(errors='ignore') #for compatibility in python 2 and 3\r

 \r
     if p.returncode != 0:\r
         raise RuntimeError("Error while execute command \'{0}\' in direcotry {1}\n{2}".format(" ".join(Args), WorkDir, message))\r
 \r
     if p.returncode != 0:\r
         raise RuntimeError("Error while execute command \'{0}\' in direcotry {1}\n{2}".format(" ".join(Args), WorkDir, message))\r