Browse Source

更改libc目录为common 以及 none-gcc

Meco Man 4 years ago
parent
commit
f9ba41f4c2

+ 23 - 11
components/libc/compilers/common/SConscript

@@ -1,15 +1,27 @@
-# RT-Thread building script for bridge
-
-import os
 from building import *
 from building import *
 
 
-cwd = GetCurrentDir()
-objs = []
-list = os.listdir(cwd)
+Import('rtconfig')
+
+src   = []
+cwd   = GetCurrentDir()
+group = []
+CPPPATH = [cwd]
+
+if GetDepend('RT_USING_LIBC'):
+    src += Glob('*.c')
+else:
+    if GetDepend('RT_LIBC_USING_TIME'):
+        src += ['time.c']
+
+if GetDepend('RT_USING_POSIX') == False:
+    SrcRemove(src, ['unistd.c'])
+
+if rtconfig.CROSS_TOOL == 'keil':
+    CPPDEFINES = ['__CLK_TCK=RT_TICK_PER_SECOND']
+else:
+    CPPDEFINES = []
 
 
-for d in list:
-    path = os.path.join(cwd, d)
-    if os.path.isfile(os.path.join(path, 'SConscript')):
-        objs = objs + SConscript(os.path.join(d, 'SConscript'))
+if GetDepend('RT_USING_LIBC') or GetDepend('RT_LIBC_USING_TIME'):
+    group = DefineGroup('libc', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES)
 
 
-Return('objs')
+Return('group')

+ 0 - 27
components/libc/compilers/common/all/SConscript

@@ -1,27 +0,0 @@
-from building import *
-
-Import('rtconfig')
-
-src   = []
-cwd   = GetCurrentDir()
-group = []
-CPPPATH = [cwd]
-
-if GetDepend('RT_USING_LIBC'):
-    src += Glob('*.c')
-else:
-    if GetDepend('RT_LIBC_USING_TIME'):
-        src += ['time.c']
-
-if GetDepend('RT_USING_POSIX') == False:
-    SrcRemove(src, ['unistd.c'])
-
-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')

+ 0 - 0
components/libc/compilers/common/all/dirent.h → components/libc/compilers/common/dirent.h


+ 0 - 0
components/libc/compilers/common/excgcc/SConscript → components/libc/compilers/common/none-gcc/SConscript


+ 0 - 0
components/libc/compilers/common/excgcc/fcntl.h → components/libc/compilers/common/none-gcc/fcntl.h


+ 0 - 0
components/libc/compilers/common/excgcc/readme.md → components/libc/compilers/common/none-gcc/readme.md


+ 0 - 0
components/libc/compilers/common/excgcc/sys/stat.h → components/libc/compilers/common/none-gcc/sys/stat.h


+ 0 - 0
components/libc/compilers/common/excgcc/sys/types.h → components/libc/compilers/common/none-gcc/sys/types.h


+ 0 - 0
components/libc/compilers/common/excgcc/sys/unistd.h → components/libc/compilers/common/none-gcc/sys/unistd.h


+ 0 - 0
components/libc/compilers/common/excgcc/unistd.h → components/libc/compilers/common/none-gcc/unistd.h


+ 0 - 0
components/libc/compilers/common/all/readme.md → components/libc/compilers/common/readme.md


+ 0 - 0
components/libc/compilers/common/all/stdlib.c → components/libc/compilers/common/stdlib.c


+ 0 - 0
components/libc/compilers/common/all/sys/ioctl.h → components/libc/compilers/common/sys/ioctl.h


+ 0 - 0
components/libc/compilers/common/all/sys/mman.h → components/libc/compilers/common/sys/mman.h


+ 0 - 0
components/libc/compilers/common/all/sys/statfs.h → components/libc/compilers/common/sys/statfs.h


+ 0 - 0
components/libc/compilers/common/all/sys/termios.h → components/libc/compilers/common/sys/termios.h


+ 0 - 0
components/libc/compilers/common/all/sys/time.h → components/libc/compilers/common/sys/time.h


+ 0 - 0
components/libc/compilers/common/all/termios.h → components/libc/compilers/common/termios.h


+ 0 - 0
components/libc/compilers/common/all/time.c → components/libc/compilers/common/time.c


+ 0 - 0
components/libc/compilers/common/all/unistd.c → components/libc/compilers/common/unistd.c