diff options
Diffstat (limited to 'src/SConscript')
-rw-r--r-- | src/SConscript | 43 |
1 files changed, 9 insertions, 34 deletions
diff --git a/src/SConscript b/src/SConscript index 8d2c8566b..b9664dd39 100644 --- a/src/SConscript +++ b/src/SConscript @@ -211,40 +211,9 @@ full_system_sources = Split(''' cpu/intr_control.cc cpu/profile.cc - dev/alpha_console.cc - dev/baddev.cc - dev/disk_image.cc - dev/etherbus.cc - dev/etherdump.cc - dev/etherint.cc - dev/etherlink.cc - dev/etherpkt.cc - dev/ethertap.cc - dev/ide_ctrl.cc - dev/ide_disk.cc - dev/io_device.cc - dev/isa_fake.cc - dev/ns_gige.cc - dev/pciconfigall.cc - dev/pcidev.cc - dev/pktfifo.cc - dev/platform.cc - dev/simconsole.cc - dev/simple_disk.cc - dev/tsunami.cc - dev/tsunami_cchip.cc - dev/tsunami_io.cc - dev/tsunami_pchip.cc - dev/uart.cc dev/uart8250.cc - kern/kernel_stats.cc - kern/system_events.cc - kern/linux/events.cc - kern/linux/linux_syscalls.cc - kern/linux/printk.cc - mem/vport.cc sim/pseudo_inst.cc @@ -252,7 +221,6 @@ full_system_sources = Split(''' #dev/sinic.cc #dev/i8254xGBe.cc - if env['TARGET_ISA'] == 'alpha': full_system_sources += Split(''' kern/tru64/dump_mbuf.cc @@ -316,9 +284,16 @@ env.Append(CPPPATH=Dir('.')) # Add a flag defining what THE_ISA should be for all compilation env.Append(CPPDEFINES=[('THE_ISA','%s_ISA' % env['TARGET_ISA'].upper())]) -arch_sources = SConscript('arch/SConscript', exports = 'env') +arch_sources = SConscript(os.path.join('arch', 'SConscript'), exports = 'env') + +cpu_sources = SConscript(os.path.join('cpu', 'SConscript'), exports = 'env') + +if env['FULL_SYSTEM']: + dev_sources = SConscript(os.path.join('dev', 'SConscript'), exports = 'env') + full_system_sources += dev_sources -cpu_sources = SConscript('cpu/SConscript', exports = 'env') + kern_sources = SConscript(os.path.join('kern', 'SConscript'), exports = 'env') + full_system_sources += kern_sources # This is outside of cpu/SConscript since the source directory isn't # underneath 'cpu'. |