修改common文件夹的sconscript 并 取消并恢复上一个commit的提交内容

This commit is contained in:
mysterywolf 2020-09-08 16:29:47 +08:00
parent 4e58b995df
commit 4305a678a3
3 changed files with 4 additions and 10 deletions

View File

@ -176,14 +176,9 @@ CONFIG_RT_USING_PIN=y
# #
# POSIX layer and C standard library # POSIX layer and C standard library
# #
CONFIG_RT_USING_LIBC=y # CONFIG_RT_USING_LIBC is not set
# CONFIG_RT_USING_PTHREADS is not set # CONFIG_RT_USING_PTHREADS is not set
CONFIG_RT_USING_POSIX=y CONFIG_RT_LIBC_USING_TIME=y
# CONFIG_RT_USING_POSIX_MMAP is not set
# CONFIG_RT_USING_POSIX_TERMIOS is not set
# CONFIG_RT_USING_POSIX_GETLINE is not set
# CONFIG_RT_USING_POSIX_AIO is not set
# CONFIG_RT_USING_MODULE is not set
# #
# Network # Network

View File

@ -107,8 +107,7 @@
/* POSIX layer and C standard library */ /* POSIX layer and C standard library */
#define RT_USING_LIBC #define RT_LIBC_USING_TIME
#define RT_USING_POSIX
/* Network */ /* Network */

View File

@ -16,7 +16,7 @@ else:
if GetDepend('RT_USING_POSIX') == False: 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'): if not GetDepend('RT_USING_MINILIBC') and (GetDepend('RT_USING_LIBC') or GetDepend('RT_LIBC_USING_TIME')):
group = DefineGroup('libc', src, depend = [''], CPPPATH = CPPPATH) group = DefineGroup('libc', src, depend = [''], CPPPATH = CPPPATH)
Return('group') Return('group')