Merge branch 'master' into developer

1 files changed, 19 insertions, 10 deletions

diff --git a/components/libc/compilers/newlib/SConscript b/components/libc/compilers/newlib/SConscript
index d0868bbdea..b1ad6e4784 100644
--- a/components/libc/compilers/newlib/SConscript
+++ b/components/libc/compilers/newlib/SConscript
@@ -1,21 +1,30 @@
 from building import *
 Import('rtconfig')
 
-src = Glob('*.c')
+src = []
 cwd = GetCurrentDir()
 group = []
 
 CPPPATH = [cwd]
-CPPDEFINES = ['RT_USING_NEWLIB']
-
-# link with libc and libm:
-# libm is a frequently used lib. Newlib is compiled with -ffunction-sections in
-# recent GCC tool chains. The linker would just link in the functions that have
-# been referenced. So setting this won't result in bigger text size.
-LIBS = ['c', 'm']
 
 if rtconfig.PLATFORM == 'gcc':
-    group = DefineGroup('libc', src, depend = ['RT_USING_LIBC'], 
-        CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES, LIBS = LIBS)
+    if GetDepend('RT_USING_LIBC'):
+        CPPDEFINES = ['RT_USING_NEWLIB']
+        # link with libc and libm:
+        # libm is a frequently used lib. Newlib is compiled with -ffunction-sections in
+        # recent GCC tool chains. The linker would just link in the functions that have
+        # been referenced. So setting this won't result in bigger text size.
+        LIBS = ['c', 'm']
+
+        src += Glob('*.c')
+        SrcRemove(src, ['minilib.c'])
+        if GetDepend('RT_USING_MODULE') == False:
+            SrcRemove(src, ['libc_syms.c'])
+    else:
+        src += ['minilib.c']
+        CPPDEFINES = []
+        LIBS = []
+
+    group = DefineGroup('libc', src, depend = [], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES, LIBS = LIBS)
 
 Return('group')