summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2010-02-15 20:48:24 +0000
committerJosé Fonseca <jfonseca@vmware.com>2010-02-15 20:48:24 +0000
commit8c7d39cc8319864d43c4a8143d09cbc09c7371ff (patch)
tree48187917ff15cf08277d149a937c8550dce29798
parentee67167358e91e9ffde8aa9e5b96e5def4c16904 (diff)
scons: A less magic way of not building progs by default.
The problem with the old way is that passing 'progs/subdir' as argument would fail.
-rw-r--r--SConstruct13
1 files changed, 7 insertions, 6 deletions
diff --git a/SConstruct b/SConstruct
index 964af7e591..ea63b90f46 100644
--- a/SConstruct
+++ b/SConstruct
@@ -225,9 +225,10 @@ SConscript(
duplicate = 0 # http://www.scons.org/doc/0.97/HTML/scons-user/x2261.html
)
-if 'progs' in COMMAND_LINE_TARGETS:
- SConscript(
- 'progs/SConscript',
- variant_dir = os.path.join('progs', env['build']),
- duplicate = 0 # http://www.scons.org/doc/0.97/HTML/scons-user/x2261.html
- )
+env.Default('src')
+
+SConscript(
+ 'progs/SConscript',
+ variant_dir = os.path.join('progs', env['build']),
+ duplicate = 0 # http://www.scons.org/doc/0.97/HTML/scons-user/x2261.html
+)