summaryrefslogtreecommitdiff
path: root/components/libc
diff options
context:
space:
mode:
author[email protected] <[email protected]>2010-11-20 12:31:00 +0000
committer[email protected] <[email protected]>2010-11-20 12:31:00 +0000
commit10732a76e9a3bf1ead47cf9848c6838236e4e343 (patch)
tree7475b1f6ff77e80bd357fc551de80565c9486080 /components/libc
parent2fce1a91e2577f06b68151dffa15558750346d02 (diff)
cleanup scons building script
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1065 bbd45198-f89e-11dd-88c7-29a3b14d5316
Diffstat (limited to 'components/libc')
-rw-r--r--components/libc/minilibc/SConscript12
-rw-r--r--components/libc/newlib/SConscript12
-rw-r--r--components/libc/newlib/syscalls.c2
3 files changed, 12 insertions, 14 deletions
diff --git a/components/libc/minilibc/SConscript b/components/libc/minilibc/SConscript
index 70122c43df..8eb7e0b58e 100644
--- a/components/libc/minilibc/SConscript
+++ b/components/libc/minilibc/SConscript
@@ -1,10 +1,8 @@
-Import('env')
Import('RTT_ROOT')
+from building import *
-# The set of source files associated with this SConscript file.
-src_local = Glob('*.c')
+src = Glob('*.c')
+CPPPATH = [RTT_ROOT + '/components/libc/minilibc']
+group = DefineGroup('minilibc', src, depend = ['RT_USING_MINILIBC'], CPPPATH = CPPPATH)
-env.Append(CPPPATH = RTT_ROOT + '/components/libc/minilibc', CPPDEFINES='RT_USING_MINILIBC')
-
-obj = env.Object(src_local)
-Return('obj')
+Return('group')
diff --git a/components/libc/newlib/SConscript b/components/libc/newlib/SConscript
index 2de094db01..d8ce850d0f 100644
--- a/components/libc/newlib/SConscript
+++ b/components/libc/newlib/SConscript
@@ -1,10 +1,8 @@
-Import('env')
Import('RTT_ROOT')
+from building import *
-# The set of source files associated with this SConscript file.
-src_local = Glob('*.c')
+src = Glob('*.c')
+CPPPATH = [RTT_ROOT + '/components/libc/newlib']
+group = DefineGroup('newlib', src, depend = ['RT_USING_NEWLIB'], CPPPATH = CPPPATH)
-env.Append(CPPPATH = RTT_ROOT + '/components/libc/newlib')
-
-obj = env.Object(src_local)
-Return('obj')
+Return('group')
diff --git a/components/libc/newlib/syscalls.c b/components/libc/newlib/syscalls.c
index 39bdeecfaa..6b040822ab 100644
--- a/components/libc/newlib/syscalls.c
+++ b/components/libc/newlib/syscalls.c
@@ -201,12 +201,14 @@ _free_r (struct _reent *ptr, void *addr)
rt_free (addr);
}
+#if 0
void __assert(const char *file, int line, const char *failedexpr)
{
rt_kprintf("assertion \"%s\" failed: file \"%s\", line %d\n",
failedexpr, file, line);
RT_ASSERT(0);
}
+#endif
void
_exit (int status)