sambuc/codezero
1
0
Fork 0
mirror of https://github.com/drasko/codezero.git synced 2026-07-12 10:24:12 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added a dependency on loader_images_S from final.elf

Browse Source 
This ensures final.elf builds whenever containers.elf file changes.
This commit is contained in:
Bahadir Balban
2009-09-24 12:56:12 +03:00
parent 2c003da964
commit b91286dcd4
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
SConstruct.loader
View File

@@ -43,9 +43,10 @@ libc = SConscript('loader/libs/c/SConscript', \
libelf = SConscript('loader/libs/elf/SConscript', exports = { 'env' : env }, \ libelf = SConscript('loader/libs/elf/SConscript', exports = { 'env' : env }, \
duplicate = 0, variant_dir = 'build/loader/libs/elf') duplicate = 0, variant_dir = 'build/loader/libs/elf')
loader_objs = SConscript('loader/SConscript', exports = { 'env' : env }, \ loader_objs, images_S = SConscript('loader/SConscript', exports = { 'env' : env }, \
duplicate = 0, variant_dir = 'build/loader') duplicate = 0, variant_dir = 'build/loader')
env.Program('build/final.elf', [libelf + libc + loader_objs]) final_elf = env.Program('build/final.elf', [libelf + libc + loader_objs])
Depends(loader_objs, libelf) Depends(loader_objs, libelf)
Depends(loader_objs, libc) Depends(loader_objs, libc)
Depends(final_elf, images_S)

9
loader/SConscript
View File

@@ -27,14 +27,13 @@ def gen_loader_images_S(target, source, env):
generate_image_S(target[0].path, source) generate_image_S(target[0].path, source)
loader_ksyms = Command(join(PROJROOT, 'loader/ksyms.S'), join(BUILDDIR, 'kernel.elf'), ksym_to_loader) loader_ksyms = Command(join(PROJROOT, 'loader/ksyms.S'), join(BUILDDIR, 'kernel.elf'), ksym_to_loader)
loader_image_S = Command(join(PROJROOT, 'loader/images.S'), \ loader_image_S = Command(join(PROJROOT, 'loader/images.S'), [join(BUILDDIR, 'kernel.elf'), join(BUILDDIR, 'conts/containers.elf')], \
[join(BUILDDIR, 'kernel.elf'), \ gen_loader_images_S)
join(BUILDDIR, 'conts/containers.elf')], \
gen_loader_images_S)
src = Glob('*.[cS]') src = Glob('*.[cS]')
objs = env.Object(src) objs = env.Object(src)
Depends(src, loader_ksyms) Depends(src, loader_ksyms)
Depends(src, loader_image_S) Depends(src, loader_image_S)
Return('objs') Depends(objs, loader_image_S)
Return('objs', 'loader_image_S')