Merge branch 'master' into master

1 files changed, 11 insertions, 6 deletions

diff --git a/components/libc/compilers/common/SConscript b/components/libc/compilers/common/SConscript
index 2407301405..319e1a3555 100644
--- a/components/libc/compilers/common/SConscript
+++ b/components/libc/compilers/common/SConscript
@@ -8,15 +8,20 @@ group = []
 CPPPATH = [cwd]
 
 if GetDepend('RT_USING_LIBC'):
-        src += Glob('*.c')      
+    src += Glob('*.c')
 else:
-        if GetDepend('RT_LIBC_USING_TIME') and not GetDepend('RT_USING_MINILIBC'):
-                src += ['time.c']
+    if GetDepend('RT_LIBC_USING_TIME'):
+        src += ['time.c']
 
 if GetDepend('RT_USING_POSIX') == False:
-        SrcRemove(src, ['unistd.c'])
+    SrcRemove(src, ['unistd.c'])
 
-if not GetDepend('RT_USING_MINILIBC') and (GetDepend('RT_USING_LIBC') or GetDepend('RT_LIBC_USING_TIME')):
-	group = DefineGroup('libc', src, depend = [''], CPPPATH = CPPPATH)
+if rtconfig.CROSS_TOOL == 'keil':
+    CPPDEFINES = ['__CLK_TCK=RT_TICK_PER_SECOND']
+else:
+    CPPDEFINES = []
+
+if GetDepend('RT_USING_LIBC') or GetDepend('RT_LIBC_USING_TIME'):
+    group = DefineGroup('libc', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES)
 
 Return('group')