diff --git a/SConstruct.loader b/SConstruct.loader index a79e8d4..c427c9c 100644 --- a/SConstruct.loader +++ b/SConstruct.loader @@ -43,10 +43,9 @@ libc = SConscript('loader/libs/c/SConscript', \ libelf = SConscript('loader/libs/elf/SConscript', exports = { 'env' : env }, \ duplicate = 0, variant_dir = 'build/loader/libs/elf') -loader_objs, images_S = SConscript('loader/SConscript', exports = { 'env' : env }, \ - duplicate = 0, variant_dir = 'build/loader') +loader_objs = SConscript('loader/SConscript', exports = { 'env' : env }, \ + duplicate = 0, variant_dir = 'build/loader') final_elf = env.Program('build/final.elf', [libelf + libc + loader_objs]) Depends(loader_objs, libelf) Depends(loader_objs, libc) -Depends(final_elf, images_S) diff --git a/loader/SConscript b/loader/SConscript index 45cd765..2f4d6ae 100644 --- a/loader/SConscript +++ b/loader/SConscript @@ -35,5 +35,5 @@ objs = env.Object(src) Depends(src, loader_ksyms) Depends(src, loader_image_S) -Depends(objs, loader_image_S) +Depends(objs, join(BUILDDIR, 'conts/containers.elf')) Return('objs', 'loader_image_S')