summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2016-04-26 14:17:39 (GMT)
committerTobias Markmann <tm@ayena.de>2016-04-26 14:17:39 (GMT)
commitee2baf882eab488342196a799fe9502bdd5c3c1d (patch)
treec906dacfd447e6a0f6cde08945379baab14443b3
parent15eb4fa29ab6516175ddc2c677b42aebfd0405e1 (diff)
downloadswift-ee2baf882eab488342196a799fe9502bdd5c3c1d.zip
swift-ee2baf882eab488342196a799fe9502bdd5c3c1d.tar.bz2
Fix scons2ninja.py due to recent change in RCC usage
Test-Information: Successfully ran ./BuildTools/scons2ninja.py and ninja on OS X 10.11.4. Change-Id: I725182a0628dec7e9237e802e009da0f6b4a50c2
-rwxr-xr-xBuildTools/scons2ninja.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/BuildTools/scons2ninja.py b/BuildTools/scons2ninja.py
index 91cd3cc..6c77c88 100755
--- a/BuildTools/scons2ninja.py
+++ b/BuildTools/scons2ninja.py
@@ -565,9 +565,11 @@ for line in build_lines :
elif tool == 'rcc':
out, flags = extract_binary_flag("-o", flags)
name, flags = extract_binary_flag("-name", flags)
+ compress, flags = extract_binary_flag("--compress", flags)
+ threshold, flags = extract_binary_flag("--threshold", flags)
files, flags = extract_non_flags(flags)
deps = list(set(get_dependencies(out, ninja.targets)) - set(files))
- ninja.build(out, 'rcc', files, deps = sorted(deps), name = name, rccflags = flags)
+ ninja.build(out, 'rcc', files, deps = sorted(deps), name = name, rccflags = ["--compress", compress, "--threshold", threshold])
############################################################
# OS X tools