Correct the include path so that task compilation succeeds.

This commit is contained in:
Russel Winder
2009-08-05 10:06:39 +01:00
parent a1dfd0b876
commit 02d3c9f07c
4 changed files with 5 additions and 18 deletions

View File

@@ -194,10 +194,9 @@ else :
CCFLAGS = [ '-g' , '-nostdlib' , '-ffreestanding' , '-std=gnu99' , '-Wall' , '-Werror' ] ,
LINKFLAGS = [ '-nostdlib' ] ,
ASFLAGS = [ '-D__ASSEMBLY__' ] ,
LIBS = 'gcc' ,
LIBS = taskLibraries + [ 'gcc' , libs['userspace'] ] ,
CPPDEFINES = [ '__USERSPACE__' ] ,
CPPPATH = [ '#' + buildDirectory + '/l4' , '#' + includeDirectory ] )
#CPPPATH = [ '#' + buildDirectory , '#' + buildDirectory + '/l4' , '#' + includeDirectory , '#' + includeDirectory + '/l4' ] )
CPPPATH = [ '#' + buildDirectory , '#' + buildDirectory + '/l4' , '#' + includeDirectory ] )
tasks = [ ]
for task in [ f.name for f in Glob ( 'tasks/*' ) if f.name not in taskLibraryNames + [ 'bootdesc' ] ] :

View File

@@ -20,11 +20,7 @@
Import ( 'environment' )
e = environment.Clone ( )
e.Append ( CPPPATH = [ 'include' , '#libs/c/include/' , '#tasks/libl4/include' , '#tasks/libmem' , '#tasks/libposix/include' ] )
# TODO: There are errors in this code that -Werror gives problems with.
#e['CCFLAGS'] = [ '-g' , '-nostdlib' , '-Wall' , '-ffreestanding' , '-std=gnu99' , '-D__USERSPACE__' ]
e.Append ( CPPPATH = [ 'include' , '#tasks/libl4/include' , '#tasks/libmem' , '#tasks/libposix/include' ] )
objects = e.StaticObject ( Glob ( '*.c' ) + Glob ( 'src/*.c' ) )
Depends ( objects , e['configFiles'] )

View File

@@ -20,11 +20,7 @@
Import ( 'environment' )
e = environment.Clone ( )
e.Append ( CPPPATH = [ 'include' , '#libs/c/include/' , '#tasks/libl4/include' , '#tasks/libmem' , '#tasks/libposix/include' ] )
# TODO: There are errors in this code that -Werror gives problems with.
#e['CCFLAGS'] = [ '-g' , '-nostdlib' , '-Wall' , '-ffreestanding' , '-std=gnu99' , '-D__USERSPACE__' ]
e.Append ( CPPPATH = [ 'include' , '#tasks/libl4/include' , '#tasks/libmem' , '#tasks/libposix/include' ] )
objects = e.StaticObject ( Glob ( '*.c' ) + Glob ( 'src/*.c' ) )
Depends ( objects , e['configFiles'] )

View File

@@ -20,11 +20,7 @@
Import ( 'environment' )
e = environment.Clone ( )
e.Append ( CPPPATH = [ 'include' , '#libs/c/include/' , '#tasks/libl4/include' , '#tasks/libmem' , '#tasks/libposix/include' ] )
# TODO: There are errors in this code that -Werror gives problems with.
#e['CCFLAGS'] = [ '-g' , '-nostdlib' , '-Wall' , '-ffreestanding' , '-std=gnu99' , '-D__USERSPACE__' ]
e.Append ( CPPPATH = [ 'include' , '#tasks/libl4/include' , '#tasks/libmem' , '#tasks/libposix/include' ] )
objects = e.StaticObject ( Glob ( '*.c' ) + Glob ( 'src/*.c' ) )
Depends ( objects , e['configFiles'] )