diff --git a/components/libc/compilers/common/SConscript b/components/libc/compilers/common/SConscript index 4c815c49b835a3a5ea61f337dc17154dd316d7d1..319e1a355505feb8f1dc982606c9b900c1eb37ad 100644 --- a/components/libc/compilers/common/SConscript +++ b/components/libc/compilers/common/SConscript @@ -1,15 +1,27 @@ -# RT-Thread building script for bridge - -import os 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') diff --git a/components/libc/compilers/common/all/SConscript b/components/libc/compilers/common/all/SConscript deleted file mode 100644 index 319e1a355505feb8f1dc982606c9b900c1eb37ad..0000000000000000000000000000000000000000 --- a/components/libc/compilers/common/all/SConscript +++ /dev/null @@ -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') diff --git a/components/libc/compilers/common/all/dirent.h b/components/libc/compilers/common/dirent.h similarity index 100% rename from components/libc/compilers/common/all/dirent.h rename to components/libc/compilers/common/dirent.h diff --git a/components/libc/compilers/common/excgcc/SConscript b/components/libc/compilers/common/none-gcc/SConscript similarity index 100% rename from components/libc/compilers/common/excgcc/SConscript rename to components/libc/compilers/common/none-gcc/SConscript diff --git a/components/libc/compilers/common/excgcc/fcntl.h b/components/libc/compilers/common/none-gcc/fcntl.h similarity index 100% rename from components/libc/compilers/common/excgcc/fcntl.h rename to components/libc/compilers/common/none-gcc/fcntl.h diff --git a/components/libc/compilers/common/excgcc/readme.md b/components/libc/compilers/common/none-gcc/readme.md similarity index 100% rename from components/libc/compilers/common/excgcc/readme.md rename to components/libc/compilers/common/none-gcc/readme.md diff --git a/components/libc/compilers/common/excgcc/sys/stat.h b/components/libc/compilers/common/none-gcc/sys/stat.h similarity index 100% rename from components/libc/compilers/common/excgcc/sys/stat.h rename to components/libc/compilers/common/none-gcc/sys/stat.h diff --git a/components/libc/compilers/common/excgcc/sys/types.h b/components/libc/compilers/common/none-gcc/sys/types.h similarity index 100% rename from components/libc/compilers/common/excgcc/sys/types.h rename to components/libc/compilers/common/none-gcc/sys/types.h diff --git a/components/libc/compilers/common/excgcc/sys/unistd.h b/components/libc/compilers/common/none-gcc/sys/unistd.h similarity index 100% rename from components/libc/compilers/common/excgcc/sys/unistd.h rename to components/libc/compilers/common/none-gcc/sys/unistd.h diff --git a/components/libc/compilers/common/excgcc/unistd.h b/components/libc/compilers/common/none-gcc/unistd.h similarity index 100% rename from components/libc/compilers/common/excgcc/unistd.h rename to components/libc/compilers/common/none-gcc/unistd.h diff --git a/components/libc/compilers/common/all/readme.md b/components/libc/compilers/common/readme.md similarity index 100% rename from components/libc/compilers/common/all/readme.md rename to components/libc/compilers/common/readme.md diff --git a/components/libc/compilers/common/all/stdlib.c b/components/libc/compilers/common/stdlib.c similarity index 100% rename from components/libc/compilers/common/all/stdlib.c rename to components/libc/compilers/common/stdlib.c diff --git a/components/libc/compilers/common/all/sys/ioctl.h b/components/libc/compilers/common/sys/ioctl.h similarity index 100% rename from components/libc/compilers/common/all/sys/ioctl.h rename to components/libc/compilers/common/sys/ioctl.h diff --git a/components/libc/compilers/common/all/sys/mman.h b/components/libc/compilers/common/sys/mman.h similarity index 100% rename from components/libc/compilers/common/all/sys/mman.h rename to components/libc/compilers/common/sys/mman.h diff --git a/components/libc/compilers/common/all/sys/statfs.h b/components/libc/compilers/common/sys/statfs.h similarity index 100% rename from components/libc/compilers/common/all/sys/statfs.h rename to components/libc/compilers/common/sys/statfs.h diff --git a/components/libc/compilers/common/all/sys/termios.h b/components/libc/compilers/common/sys/termios.h similarity index 100% rename from components/libc/compilers/common/all/sys/termios.h rename to components/libc/compilers/common/sys/termios.h diff --git a/components/libc/compilers/common/all/sys/time.h b/components/libc/compilers/common/sys/time.h similarity index 100% rename from components/libc/compilers/common/all/sys/time.h rename to components/libc/compilers/common/sys/time.h diff --git a/components/libc/compilers/common/all/termios.h b/components/libc/compilers/common/termios.h similarity index 100% rename from components/libc/compilers/common/all/termios.h rename to components/libc/compilers/common/termios.h diff --git a/components/libc/compilers/common/all/time.c b/components/libc/compilers/common/time.c similarity index 100% rename from components/libc/compilers/common/all/time.c rename to components/libc/compilers/common/time.c diff --git a/components/libc/compilers/common/all/unistd.c b/components/libc/compilers/common/unistd.c similarity index 100% rename from components/libc/compilers/common/all/unistd.c rename to components/libc/compilers/common/unistd.c