--- buildtools/wafadmin/Utils.py.orig	2014-10-01 18:12:21.000000000 +1000
+++ buildtools/wafadmin/Utils.py	2021-12-29 15:45:31.948625000 +1000
@@ -423,7 +423,7 @@
 	except OSError:
 		try:
 			os.makedirs(dir)
-		except OSError, e:
+		except OSError as e:
 			raise WafError("Cannot create folder '%s' (original error: %s)" % (dir, e))
 
 def cmd_output(cmd, **kw):
@@ -446,7 +446,7 @@
 	try:
 		p = pproc.Popen(cmd, **kw)
 		output = p.communicate()[0]
-	except OSError, e:
+	except OSError as e:
 		raise ValueError(str(e))
 
 	if p.returncode:
@@ -474,7 +474,7 @@
 def unversioned_sys_platform_to_binary_format(unversioned_sys_platform):
 	"infers the binary format from the unversioned_sys_platform name."
 
-	if unversioned_sys_platform in ('linux', 'freebsd', 'netbsd', 'openbsd', 'sunos', 'gnu'):
+	if unversioned_sys_platform in ('linux', 'bsdsunix', 'freebsd', 'netbsd', 'openbsd', 'sunos', 'gnu'):
 		return 'elf'
 	elif unversioned_sys_platform == 'darwin':
 		return 'mac-o'