diff options
| author | Grissiom <[email protected]> | 2015-01-06 13:39:54 +0800 |
|---|---|---|
| committer | Grissiom <[email protected]> | 2015-01-06 13:39:54 +0800 |
| commit | bcbe180886e7beab7585a03b5067fb60eae4af2d (patch) | |
| tree | b25c874215a9a6fc35b4a645db8f2d88193b8c23 /bsp/lpc43xx | |
| parent | fca84daa9dff8ad17e6b3669a652fdbb98acdc75 (diff) | |
lpc43xx: fix the default RTT_ROOT in SConstruct
Diffstat (limited to 'bsp/lpc43xx')
| -rw-r--r-- | bsp/lpc43xx/M0/SConstruct | 2 | ||||
| -rw-r--r-- | bsp/lpc43xx/M4/SConstruct | 21 |
2 files changed, 20 insertions, 3 deletions
diff --git a/bsp/lpc43xx/M0/SConstruct b/bsp/lpc43xx/M0/SConstruct index f6f21f4ec4..62cebd454f 100644 --- a/bsp/lpc43xx/M0/SConstruct +++ b/bsp/lpc43xx/M0/SConstruct @@ -5,7 +5,7 @@ import rtconfig if os.getenv('RTT_ROOT'): RTT_ROOT = os.getenv('RTT_ROOT') else: - RTT_ROOT = os.path.join(Dir('#').get_abspath(), '..', '..', 'rt-thread') + RTT_ROOT = os.path.join(Dir('#').get_abspath(), '..', '..', '..') sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')] from building import * diff --git a/bsp/lpc43xx/M4/SConstruct b/bsp/lpc43xx/M4/SConstruct index f6f21f4ec4..17f5eaf11c 100644 --- a/bsp/lpc43xx/M4/SConstruct +++ b/bsp/lpc43xx/M4/SConstruct @@ -5,12 +5,12 @@ import rtconfig if os.getenv('RTT_ROOT'): RTT_ROOT = os.getenv('RTT_ROOT') else: - RTT_ROOT = os.path.join(Dir('#').get_abspath(), '..', '..', 'rt-thread') + RTT_ROOT = os.path.join(Dir('#').get_abspath(), '..', '..', '..') sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')] from building import * -TARGET = 'rtthread-lpc40xx.' + rtconfig.TARGET_EXT +TARGET = 'build/rtthread_lpc43xx.' + rtconfig.TARGET_EXT env = Environment(tools = ['mingw'], AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS, @@ -25,5 +25,22 @@ Export('rtconfig') # prepare building environment objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) +if rtconfig.CROSS_TOOL == 'gcc': + print 'build M0 code first' + if sys.platform.startswith('linux'): + ocwd = os.getcwdu() + os.chdir('../M0') + res = os.system('scons') + if res: + print 'build M0 exit with code %d\n' % res + sys.exit(res) + os.chdir(ocwd) + else: + # assume Windows. + ocwd = os.getcwdu() + os.chdir('..\M0') + os.system('scons.bat') + os.chdir(ocwd) + # do building DoBuilding(TARGET, objs) |