libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #259 from grissiom/fix-scons 

Fix scons
This commit is contained in:
Bernard Xiong 2014-04-11 17:04:06 +08:00
parent 279f2cb948 81b284b316
commit 0c4ac4bd1a
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/building.py
View File

@ -192,18 +192,23 @@ def PrepareBuilding(env, root_directory, has_libcpu=False, remove_components = [
LINKCOMSTR = 'LINK $TARGET' LINKCOMSTR = 'LINK $TARGET'
) )
# we need to seperate the variant_dir for BSPs and the kernels. BSPs could
# have their own components etc. If they point to the same folder, SCons
# would find the wrong source code to compile.
bsp_vdir = 'build/bsp'
kernel_vdir = 'build/kernel'
# board build script # board build script
objs = SConscript('SConscript', variant_dir='build', duplicate=0) objs = SConscript('SConscript', variant_dir=bsp_vdir, duplicate=0)
Repository(Rtt_Root)
# include kernel # include kernel
objs.extend(SConscript(Rtt_Root + '/src/SConscript', variant_dir='build/src', duplicate=0)) objs.extend(SConscript(Rtt_Root + '/src/SConscript', variant_dir=kernel_vdir + '/src', duplicate=0))
# include libcpu # include libcpu
if not has_libcpu: if not has_libcpu:
objs.extend(SConscript(Rtt_Root + '/libcpu/SConscript', variant_dir='build/libcpu', duplicate=0)) objs.extend(SConscript(Rtt_Root + '/libcpu/SConscript',
variant_dir=kernel_vdir + '/libcpu', duplicate=0))
# include components # include components
objs.extend(SConscript(Rtt_Root + '/components/SConscript', objs.extend(SConscript(Rtt_Root + '/components/SConscript',
variant_dir='build/components', variant_dir=kernel_vdir + '/components',
duplicate=0, duplicate=0,
exports='remove_components')) exports='remove_components'))