From 02d3c9f07c867f893917f62eb85a418f7eeb812d Mon Sep 17 00:00:00 2001
From: Russel Winder <russel@russel.org.uk>
Date: Wed, 5 Aug 2009 10:06:39 +0100
Subject: [PATCH] Correct the include path so that task compilation succeeds.

---
 SConstruct             | 5 ++---
 tasks/fs0/SConscript   | 6 +-----
 tasks/mm0/SConscript   | 6 +-----
 tasks/test0/SConscript | 6 +-----
 4 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/SConstruct b/SConstruct
index f722fd3..0e5f6e1 100644
--- a/SConstruct
+++ b/SConstruct
@@ -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' ] ] :
diff --git a/tasks/fs0/SConscript b/tasks/fs0/SConscript
index 5f0d849..1943091 100644
--- a/tasks/fs0/SConscript
+++ b/tasks/fs0/SConscript
@@ -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'] )
diff --git a/tasks/mm0/SConscript b/tasks/mm0/SConscript
index fa01a83..792ab83 100644
--- a/tasks/mm0/SConscript
+++ b/tasks/mm0/SConscript
@@ -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'] )
diff --git a/tasks/test0/SConscript b/tasks/test0/SConscript
index 1e1a0ad..2aa47d5 100644
--- a/tasks/test0/SConscript
+++ b/tasks/test0/SConscript
@@ -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'] )