diff options
| author | Bernard Xiong <[email protected]> | 2018-05-15 08:38:49 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-05-15 08:38:49 +0800 |
| commit | 352b31a9dc45a3e20a28ee27d97f2a706b49a02f (patch) | |
| tree | 0ddc8744bd9173c390a42456f78a6da50d3a313e /components | |
| parent | ab33cd3110a4b303c7c934f3da84f9c64c4ebb73 (diff) | |
| parent | 6ac213d62275676c1ba79039c6fd2683e2877662 (diff) | |
Merge pull request #1434 from RT-Thread/gcc_detection
Add GCC version detection.
Diffstat (limited to 'components')
| -rw-r--r-- | components/dfs/Kconfig | 14 | ||||
| -rw-r--r-- | components/libc/Kconfig | 6 | ||||
| -rw-r--r-- | components/libc/compilers/armlibc/SConscript | 6 |
3 files changed, 6 insertions, 20 deletions
diff --git a/components/dfs/Kconfig b/components/dfs/Kconfig index 19c1327da6..79b26ffa2d 100644 --- a/components/dfs/Kconfig +++ b/components/dfs/Kconfig @@ -103,20 +103,6 @@ if RT_USING_DFS help Let BSD socket operated by file system API, such as read/write and involveed in select/poll POSIX APIs. - if RT_USING_DFS_NET - config HAVE_SYS_SELECT_H - bool "Toolchains/libc have provided sys/select.h" - default n - help - Toolchains/libc have provided sys/select.h file, therefore, disable the sys/select.h in RT-Thread. - - config HAVE_SYS_SOCKET_H - bool "Toolchains/libc have provided sys/socket.h" - default n - help - Toolchains/libc have provided sys/socket.h file, therefore, disable the sys/socket.h in RT-Thread. - endif - config RT_USING_DFS_ROMFS bool "Enable ReadOnly file system on flash" default n diff --git a/components/libc/Kconfig b/components/libc/Kconfig index 0b1db61c30..7ad048e909 100644 --- a/components/libc/Kconfig +++ b/components/libc/Kconfig @@ -35,10 +35,4 @@ if RT_USING_LIBC && RT_USING_DFS endif endif -config HAVE_SYS_SIGNALS - bool "Toolchains/libc has sigval/sigevent structure definitions" - default n - help - Toolchains/libc has sigval/sigevent/siginfo_t definitions. - endmenu diff --git a/components/libc/compilers/armlibc/SConscript b/components/libc/compilers/armlibc/SConscript index 8968abaa82..081efa7358 100644 --- a/components/libc/compilers/armlibc/SConscript +++ b/components/libc/compilers/armlibc/SConscript @@ -8,6 +8,12 @@ group = [] CPPPATH = [cwd] CPPDEFINES = ['RT_USING_ARM_LIBC'] +if GetDepend('RT_USING_DFS') == False: + SrcRemove(src, ['stdio.c']) + +if GetDepend('RT_USING_MODULE') == False: + SrcRemove(src, ['libc_syms.c']) + if rtconfig.PLATFORM == 'armcc': group = DefineGroup('libc', src, depend = ['RT_USING_LIBC'], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES) |