Browse Source

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

mysterywolf 4 years ago
parent
commit
4305a678a3
3 changed files with 4 additions and 10 deletions
  1. 2 7
      bsp/lpc408x/.config
  2. 1 2
      bsp/lpc408x/rtconfig.h
  3. 1 1
      components/libc/compilers/common/SConscript

+ 2 - 7
bsp/lpc408x/.config

@@ -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_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
+CONFIG_RT_LIBC_USING_TIME=y
 
 
 #
 #
 # Network
 # Network

+ 1 - 2
bsp/lpc408x/rtconfig.h

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

+ 1 - 1
components/libc/compilers/common/SConscript

@@ -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')