summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-11-27 21:26:10 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-11-27 21:26:10 (GMT)
commit48ffe88bf768fd762a3bcb52717a9079ec803de5 (patch)
tree57c49fe3ba8b95f193bf1431d8ba819a4981b0ad /BuildTools
parent51517e2adaed04a10709f24c31138e7c2b60d4d8 (diff)
downloadswift-48ffe88bf768fd762a3bcb52717a9079ec803de5.zip
swift-48ffe88bf768fd762a3bcb52717a9079ec803de5.tar.bz2
Introduce SWIFTEN_DEP_FLAGS.
Diffstat (limited to 'BuildTools')
-rw-r--r--BuildTools/SCons/SConstruct12
1 files changed, 6 insertions, 6 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct
index fc9ca3b..31d74fa 100644
--- a/BuildTools/SCons/SConstruct
+++ b/BuildTools/SCons/SConstruct
@@ -553,20 +553,20 @@ if env.Dir("#/.git").exists() :
# Modules
modules = []
-for dir in os.listdir(Dir("#").abspath) :
- full_dir = os.path.join(Dir("#").abspath, dir)
+for dir in os.listdir(Dir("#/3rdParty").abspath) :
+ full_dir = os.path.join(Dir("#/3rdParty").abspath, dir)
if not os.path.isdir(full_dir) :
continue
sconscript = os.path.join(full_dir, "SConscript")
if os.path.isfile(sconscript) :
- modules.append(dir)
-for dir in os.listdir(Dir("#/3rdParty").abspath) :
- full_dir = os.path.join(Dir("#/3rdParty").abspath, dir)
+ modules.append("3rdParty/" + dir)
+for dir in os.listdir(Dir("#").abspath) :
+ full_dir = os.path.join(Dir("#").abspath, dir)
if not os.path.isdir(full_dir) :
continue
sconscript = os.path.join(full_dir, "SConscript")
if os.path.isfile(sconscript) :
- modules.append("3rdParty/" + dir)
+ modules.append(dir)
# Flags
env["PROJECTS"] = [m for m in modules if m not in ["Documentation", "QA", "SwifTools"] and not m.startswith("3rdParty")]