Browse Source

修复在simulator win32平台下,nonegcc文件夹路径没有添加到工程的bug

Meco Man 4 years ago
parent
commit
d9abe8fa30

+ 7 - 5
components/libc/compilers/common/SConscript

@@ -23,9 +23,11 @@ else:
 
 
 if GetDepend('RT_USING_LIBC') or GetDepend('RT_LIBC_USING_TIME'):
 if GetDepend('RT_USING_LIBC') or GetDepend('RT_LIBC_USING_TIME'):
     group = DefineGroup('libc', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES)
     group = DefineGroup('libc', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES)
-    list = os.listdir(cwd)
-    for d in list:
-        path = os.path.join(cwd, d)
-        if os.path.isfile(os.path.join(path, 'SConscript')):
-            group = group + SConscript(os.path.join(d, 'SConscript'))
+
+list = os.listdir(cwd)
+for d in list:
+    path = os.path.join(cwd, d)
+    if os.path.isfile(os.path.join(path, 'SConscript')):
+        group = group + SConscript(os.path.join(d, 'SConscript'))
+
 Return('group')
 Return('group')

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

@@ -8,6 +8,6 @@ CPPPATH = [cwd]
 group = []
 group = []
 src += Glob('*.c')
 src += Glob('*.c')
 
 
-if rtconfig.PLATFORM != 'gcc':
+if rtconfig.PLATFORM != 'gcc' or rtconfig.ARCH == 'sim':
     group = DefineGroup('libc', src, depend = ['RT_USING_LIBC'], CPPPATH = CPPPATH)
     group = DefineGroup('libc', src, depend = ['RT_USING_LIBC'], CPPPATH = CPPPATH)
 Return('group')
 Return('group')