diff options
| author | Jianting (Meco) Man <[email protected]> | 2021-11-07 20:54:16 -0500 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-11-07 20:54:16 -0500 |
| commit | 910961c09115fc87a5634929182d408b77bc6c3d (patch) | |
| tree | 0d25eff44fe5afa942e5b3136c20375740993ceb /components | |
| parent | 664a1d6a756ec569221f20cb016110755715842c (diff) | |
| parent | 9e7d7ae52544fd8e84f18734fd4216fc7659d9c9 (diff) | |
Merge branch 'master' into posix
Diffstat (limited to 'components')
| -rw-r--r-- | components/libc/compilers/common/SConscript | 1 | ||||
| -rw-r--r-- | components/libc/posix/src/SConscript | 3 | ||||
| -rw-r--r-- | components/libc/posix/src/libc.c | 2 |
3 files changed, 2 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 384e71261a..ab649ec6bc 100644 --- a/components/libc/posix/src/SConscript +++ b/components/libc/posix/src/SConscript @@ -1,6 +1,5 @@ -# RT-Thread building script for component - from building import * +Import('rtconfig') src = ['libc.c','delay.c','unistd.c'] cwd = GetCurrentDir() 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 */ |