diff options
| author | Wayne Lin <[email protected]> | 2020-12-29 19:36:00 +0800 |
|---|---|---|
| committer | Wayne Lin <[email protected]> | 2020-12-29 19:36:00 +0800 |
| commit | c9892a82bec1f77146fbf7bed6294384dcad62d5 (patch) | |
| tree | 4a119920fa6e9040508383486a6cd432e8ae7e9a /components/libc | |
| parent | 1c4328e5a9f6e1cbb737f975e689fc21ea8f6cca (diff) | |
| parent | 94ba15a80b4856b9654aefa0510465b084a7e459 (diff) | |
Merge branch 'master' of https://github.com/RT-Thread/rt-thread into nuvoton
Diffstat (limited to 'components/libc')
| -rw-r--r-- | components/libc/aio/SConscript | 2 | ||||
| -rw-r--r-- | components/libc/compilers/dlib/SConscript | 2 | ||||
| -rw-r--r-- | components/libc/compilers/newlib/SConscript | 2 | ||||
| -rw-r--r-- | components/libc/pthreads/SConscript | 2 | ||||
| -rw-r--r-- | components/libc/time/SConscript | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/components/libc/aio/SConscript b/components/libc/aio/SConscript index 175767100a..f10462e9c4 100644 --- a/components/libc/aio/SConscript +++ b/components/libc/aio/SConscript @@ -6,6 +6,6 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] -group = DefineGroup('aio', src, depend = ['RT_USING_POSIX', 'RT_USING_POSIX_AIO'], CPPPATH = CPPPATH) +group = DefineGroup('libc', src, depend = ['RT_USING_POSIX', 'RT_USING_POSIX_AIO'], CPPPATH = CPPPATH) Return('group') diff --git a/components/libc/compilers/dlib/SConscript b/components/libc/compilers/dlib/SConscript index 456b762496..75a5812fab 100644 --- a/components/libc/compilers/dlib/SConscript +++ b/components/libc/compilers/dlib/SConscript @@ -20,7 +20,7 @@ if rtconfig.PLATFORM == 'iar': if LooseVersion(IARVersion()) < LooseVersion("8.20.1"): CPPDEFINES = CPPDEFINES + ['_DLIB_THREAD_SUPPORT'] - group = DefineGroup('dlib', src, depend = ['RT_USING_LIBC'], + group = DefineGroup('libc', src, depend = ['RT_USING_LIBC'], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES) Return('group') diff --git a/components/libc/compilers/newlib/SConscript b/components/libc/compilers/newlib/SConscript index 06e5faad09..d0868bbdea 100644 --- a/components/libc/compilers/newlib/SConscript +++ b/components/libc/compilers/newlib/SConscript @@ -15,7 +15,7 @@ CPPDEFINES = ['RT_USING_NEWLIB'] LIBS = ['c', 'm'] if rtconfig.PLATFORM == 'gcc': - group = DefineGroup('newlib', src, depend = ['RT_USING_LIBC'], + group = DefineGroup('libc', src, depend = ['RT_USING_LIBC'], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES, LIBS = LIBS) Return('group') diff --git a/components/libc/pthreads/SConscript b/components/libc/pthreads/SConscript index e154ee0aa9..767b406d4c 100644 --- a/components/libc/pthreads/SConscript +++ b/components/libc/pthreads/SConscript @@ -16,7 +16,7 @@ try: except : pass -group = DefineGroup('pthreads', src, +group = DefineGroup('libc', src, depend = ['RT_USING_PTHREADS', 'RT_USING_LIBC'], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES) Return('group') diff --git a/components/libc/time/SConscript b/components/libc/time/SConscript index 4ecd5d24bc..f7e6f7e8e9 100644 --- a/components/libc/time/SConscript +++ b/components/libc/time/SConscript @@ -6,7 +6,7 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] -group = DefineGroup('pthreads', src, +group = DefineGroup('libc', src, depend = ['RT_USING_PTHREADS'], CPPPATH = CPPPATH) Return('group') |