summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2015-05-05 12:25:27 (GMT)
committerTobias Markmann <tm@ayena.de>2015-05-05 12:25:27 (GMT)
commit285bf92672e618124cedf554f39c7f30824453bf (patch)
treeee121577c57c283e24872a1c8fdb9614537a60b3
parent8e08eb7cb5638a32d4d7e2b73ef2aa1e933965bb (diff)
downloadswift-285bf92672e618124cedf554f39c7f30824453bf.zip
swift-285bf92672e618124cedf554f39c7f30824453bf.tar.bz2
Fix scons2ninja.py for Windows
shlex.split has a 3rd parameter specifying whether or not to run in POSIX mode, which defaults to True. This breaks splitting of Windows paths so it is set to False on Windows. Test-Information: Tested on OS X 10.9.5 and Windows 8. Change-Id: Icdc9fc07e89a80249526daa8f13dba081f957670
-rwxr-xr-xBuildTools/scons2ninja.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/BuildTools/scons2ninja.py b/BuildTools/scons2ninja.py
index a39ed32..c0eca0d 100755
--- a/BuildTools/scons2ninja.py
+++ b/BuildTools/scons2ninja.py
@@ -120,7 +120,7 @@ def get_built_libs(libs, libpaths, outputs) :
return result
def parse_tool_command(line) :
- command = shlex.split(line)
+ command = shlex.split(line, False, False if sys.platform == 'win32' else True)
flags = command[1:]
tool = os.path.splitext(os.path.basename(command[0]))[0]
if tool.startswith('clang++') or tool.startswith('g++') :