Can now compile loader, libl4, libelf, libc from SConstruct.loader

This commit is contained in:
Bahadir Balban
2009-09-14 19:07:12 +03:00
parent 698e4702ff
commit e08ab58b09
3 changed files with 9 additions and 21 deletions

View File

@@ -41,6 +41,6 @@ objects += SConscript('src/api/SConscript', exports = {'symbols' : all_syms, 'en
kernel_elf = env.Program(BUILDDIR + '/kernel.elf', objects)
#libl4 = SConscript('conts/libl4/SConscript', \
# exports = { 'arch' : arch }, duplicate = 0, \
# variant_dir = join(BUILDDIR, os.path.relpath('conts/libl4', PROJROOT)))
libl4 = SConscript('conts/libl4/SConscript', \
exports = { 'arch' : arch }, duplicate = 0, \
variant_dir = join(BUILDDIR, os.path.relpath('conts/libl4', PROJROOT)))

View File

@@ -33,7 +33,7 @@ env = Environment(CC = 'arm-none-linux-gnueabi-gcc',
ASFLAGS = ['-D__ASSEMBLY__'],
ENV = {'PATH' : os.environ['PATH']},
LIBS = 'gcc',
CPPPATH = ['#include', '#include/l4lib/arch', join(PROJROOT,'include') ])
CPPPATH = ['include', 'include/l4lib/arch', join(PROJROOT, 'include') ])
def create_symlinks(arch):

View File

@@ -4,28 +4,16 @@
#
# Copyright © 2009 B Labs Ltd
#
# This program is free software: you can redistribute it and/or modify it under the terms of the GNU
# General Public License as published by the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
# License for more details.
#
# You should have received a copy of the GNU General Public License along with this program. If not, see
# <http://www.gnu.org/licenses/>.
#
# Author: Russel Winder
Import('environment')
Import('env')
e = environment.Clone()
e.Append(CPPPATH = ['include', '#libs/c/include', '#libs/c/include/arch/' + e['ARCH']])
arch = 'arm'
e = env.Clone()
#e.Append(CPPPATH = ['include', '#libs/c/include', '#libs/c/include/arch/' + arch])
e.Append(CPPPATH = ['include'])
e.Append(CCFLAGS = '-nostdinc')
objects = e.StaticObject(Glob('src/*.c'))
Depends(objects, e['configFiles'])
library = e.StaticLibrary('elf', objects)
Depends(library, e['configFiles'])
Return('library')