diff options
| author | Bernard Xiong <[email protected]> | 2021-11-04 08:42:57 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-11-04 08:42:57 +0800 |
| commit | 9a59a0d5698b4cf88ebe4ee52a42d3544acb0c22 (patch) | |
| tree | 7b91f6f61e654fccbd145222a801e6fe74708d20 /components | |
| parent | 4fe6c709d0bfe719bed6c927f0144ba373bbda5a (diff) | |
| parent | 3c232125db049a42b97287e4eb44ea0664e7538c (diff) | |
Merge pull request #5247 from mysterywolf/sim
[bsp][simulator] update project
Diffstat (limited to 'components')
| -rw-r--r-- | components/libc/compilers/common/SConscript | 1 | ||||
| -rw-r--r-- | components/libc/posix/src/SConscript | 6 | ||||
| -rw-r--r-- | components/libc/posix/src/libc.c | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/components/libc/compilers/common/SConscript b/components/libc/compilers/common/SConscript index bd66b70c7e..504bf84e56 100644 --- a/components/libc/compilers/common/SConscript +++ b/components/libc/compilers/common/SConscript @@ -1,5 +1,4 @@ from building import * - Import('rtconfig') src = [] diff --git a/components/libc/posix/src/SConscript b/components/libc/posix/src/SConscript index 8712d671c0..f338b52cec 100644 --- a/components/libc/posix/src/SConscript +++ b/components/libc/posix/src/SConscript @@ -1,11 +1,13 @@ -# RT-Thread building script for component - from building import * +Import('rtconfig') src = Glob('*.c') cwd = GetCurrentDir() CPPPATH = [cwd] +if rtconfig.ARCH == 'sim': # the vs simulator does not support select and poll + SrcRemove(src, ['select.c', 'poll.c']) + group = DefineGroup('POSIX', src, depend = ['RT_USING_POSIX'], CPPPATH = CPPPATH) Return('group') diff --git a/components/libc/posix/src/libc.c b/components/libc/posix/src/libc.c index 84c5a601bc..068719d5d6 100644 --- a/components/libc/posix/src/libc.c +++ b/components/libc/posix/src/libc.c @@ -144,5 +144,5 @@ int libc_stdio_set_console(const char* device_name, int mode) int libc_stdio_get_console(void) { return std_fd; } -#endif /* defined(RT_USING_LIBC) && (defined(__GNUC__) && !defined(__ARMCC_VERSION)) */ +#endif /* defined(RT_USING_LIBC) && defined(RT_USING_NEWLIB) */ #endif /* RT_USING_POSIX */ |