summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVegard Storheil Eriksen <zyp@jvnv.net>2012-10-13 17:25:59 +0200
committerVegard Storheil Eriksen <zyp@jvnv.net>2012-10-13 17:25:59 +0200
commit94f53e8caf81e0fbc556dea226d8479963e304a8 (patch)
treee566446e71d76a3f07b766d2dc093e576e51e254
parenta233603254fad2736243bd9857ce52d3defbfd7b (diff)
Allow specifying variant_dir to SelectMCU.
-rw-r--r--SConscript2
-rw-r--r--build_rules6
2 files changed, 6 insertions, 2 deletions
diff --git a/SConscript b/SConscript
index 5d706af..bc20764 100644
--- a/SConscript
+++ b/SConscript
@@ -5,3 +5,5 @@ Import('env')
env.Append(
LIB_SOURCES = Glob('*.cpp') + Glob('*/*.cpp'),
)
+
+# vim: syn=python
diff --git a/build_rules b/build_rules
index 225d86a..3fa0f91 100644
--- a/build_rules
+++ b/build_rules
@@ -58,7 +58,7 @@ def select_stm32(env, variant):
print 'Unknown stm32 family: %s' % mcu
Exit(1)
-def SelectMCU(env, mcu):
+def SelectMCU(env, mcu, variant_dir = None):
mcu = mcu.lower()
if mcu.startswith('stm32'):
@@ -68,7 +68,7 @@ def SelectMCU(env, mcu):
print 'Unknown MCU: %s' % mcu
Exit(1)
- SConscript(main_sconscript, exports = 'env')
+ SConscript(main_sconscript, variant_dir = variant_dir, exports = 'env')
AddMethod(Environment, SelectMCU)
@@ -78,3 +78,5 @@ def Firmware(env, target, sources):
return firmware
AddMethod(Environment, Firmware)
+
+# vim: syn=python