libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4693 from mysterywolf/sim-sconcsript 

[libc][bug] 修复在simulator win32平台下，none-gcc文件夹路径没有添加到工程的bug
This commit is contained in:
Bernard Xiong 2021-05-16 08:56:29 +08:00 committed by GitHub
parent d0793bc04c d9abe8fa30
commit 6cb1d4efcc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/libc/compilers/common/SConscript
View File

@ -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: list = os.listdir(cwd)
path = os.path.join(cwd, d) for d in list:
if os.path.isfile(os.path.join(path, 'SConscript')): path = os.path.join(cwd, d)
group = group + SConscript(os.path.join(d, 'SConscript')) if os.path.isfile(os.path.join(path, 'SConscript')):
group = group + SConscript(os.path.join(d, 'SConscript'))
Return('group') Return('group')

2
components/libc/compilers/common/none-gcc/SConscript
View File

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