Index: scripts/Python/buildSwigPython.py
===================================================================
--- scripts/Python/buildSwigPython.py
+++ scripts/Python/buildSwigPython.py
@@ -436,7 +436,7 @@
 """
 def remove_ignore_enoent(filename):
 	try:
-		os.remove( strSwigOutputFile );
+		os.remove( filename );
 	except OSError as e:
 		import errno
 		if e.errno != errno.ENOENT:
@@ -702,7 +702,7 @@
 		remove_ignore_enoent( strSwigOutputFile )
 		open( strSwigOutputFile, 'w' ).close(); # Touch the file
 		if bDebug:
-			strMsg = strMsgLldbDisablePython;
+			strMsg = strMsgLldbDisablePythonEnv;
 		return (0, strMsg );
 		
 	# If this project is being built with LLDB_DISABLE_PYTHON defined,
Index: scripts/Python/finishSwigPythonLLDB.py
===================================================================
--- scripts/Python/finishSwigPythonLLDB.py
+++ scripts/Python/finishSwigPythonLLDB.py
@@ -298,7 +298,7 @@
 		return (bOk, strErrMsg);
 	else:
 		# Resolve vstrSrcFile path relatively the build directory
-		stdBuildDir = "";
+		strBuildDir = "";
 		if eOSType == utilsOsType.EnumOsType.Windows:
 			# On a Windows platform the vstrFrameworkPythonDir looks like:
 			# llvm\\build\\Lib\\site-packages\\lldb