diff options
| author | Bernard Xiong <[email protected]> | 2021-05-16 08:56:29 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-05-16 08:56:29 +0800 |
| commit | 6cb1d4efcce65dfd6ae1bfc06dda3c11c04b0633 (patch) | |
| tree | 3c19093a4f92a91101215bda8f4ae6f794d2f2fb /components/libc/compilers/common | |
| parent | d0793bc04cf6a964de128c44e7f83bb2e4800e6e (diff) | |
| parent | d9abe8fa30f04e0ac54a7ea2c50f3df750cff04e (diff) | |
Merge pull request #4693 from mysterywolf/sim-sconcsript
[libc][bug] 修复在simulator win32平台下，none-gcc文件夹路径没有添加到工程的bug
Diffstat (limited to 'components/libc/compilers/common')
| -rw-r--r-- | components/libc/compilers/common/SConscript | 12 | ||||
| -rw-r--r-- | components/libc/compilers/common/none-gcc/SConscript | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/components/libc/compilers/common/SConscript b/components/libc/compilers/common/SConscript index d9de1cf17f..039e53a0b3 100644 --- a/components/libc/compilers/common/SConscript +++ b/components/libc/compilers/common/SConscript @@ -23,9 +23,11 @@ else: if GetDepend('RT_USING_LIBC') or GetDepend('RT_LIBC_USING_TIME'): 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') diff --git a/components/libc/compilers/common/none-gcc/SConscript b/components/libc/compilers/common/none-gcc/SConscript index 346e69b478..c5838f8949 100644 --- a/components/libc/compilers/common/none-gcc/SConscript +++ b/components/libc/compilers/common/none-gcc/SConscript @@ -8,6 +8,6 @@ CPPPATH = [cwd] group = [] 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) Return('group') |