From 639dfc4b308616955adcef6828f63e9f0b35b003 Mon Sep 17 00:00:00 2001
From: "Christoph M. Wintersteiger" <cwinter@microsoft.com>
Date: Sat, 14 Nov 2015 15:06:55 +0000
Subject: [PATCH] fix for string decoding in build scripts

---
 scripts/mk_util.py    | 7 ++++++-
 scripts/update_api.py | 6 +++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/scripts/mk_util.py b/scripts/mk_util.py
index 225a38c04..66ccb7b65 100644
--- a/scripts/mk_util.py
+++ b/scripts/mk_util.py
@@ -90,7 +90,12 @@ FPMATH="Default"
 FPMATH_FLAGS="-mfpmath=sse -msse -msse2"
 
 def check_output(cmd):
-    return (subprocess.Popen(cmd, stdout=subprocess.PIPE).communicate()[0]).decode(sys.stdout.encoding).rstrip('\r\n')
+    out = subprocess.Popen(cmd, stdout=subprocess.PIPE).communicate()[0]
+    if out != None:
+        enc = sys.stdout.encoding
+        if enc != None: out.decode(enc).rstrip('\r\n')
+        else: out.rstrip('\r\n')
+    else: ""
 
 def git_hash():
     try:
diff --git a/scripts/update_api.py b/scripts/update_api.py
index 1ad85d228..85ee296e3 100644
--- a/scripts/update_api.py
+++ b/scripts/update_api.py
@@ -96,7 +96,11 @@ if sys.version < '3':
      return s
 else:
   def _to_pystr(s):
-     return s.decode(sys.stdout.encoding)
+     if s != None:
+        enc = sys.stdout.encoding
+        if enc != None: s.decode(enc)
+        else: s
+     else: ""
 
 def init(PATH):
   global _lib