diff options
| author | heyuanjie <[email protected]> | 2018-05-02 09:47:57 +0800 |
|---|---|---|
| committer | heyuanjie <[email protected]> | 2018-05-02 09:47:57 +0800 |
| commit | 313920126ba1bfaa7fb833860536c03f78f436fb (patch) | |
| tree | 54b011f26104ae478323cc33709e9f9622023662 /components/libc/compilers/dlib/SConscript | |
| parent | aa86f7f7bb78443780a71486a66c2f339243484f (diff) | |
| parent | 795f9873ccd1fc71497d5c2d96fb870ea17fe67b (diff) | |
Merge branch 'master' of https://github.com/RT-Thread/rt-thread into imx1050
Diffstat (limited to 'components/libc/compilers/dlib/SConscript')
| -rw-r--r-- | components/libc/compilers/dlib/SConscript | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/components/libc/compilers/dlib/SConscript b/components/libc/compilers/dlib/SConscript index 8ae7484894..456b762496 100644 --- a/components/libc/compilers/dlib/SConscript +++ b/components/libc/compilers/dlib/SConscript @@ -1,17 +1,24 @@ from building import * + Import('rtconfig') src = Glob('*.c') cwd = GetCurrentDir() group = [] -CPPPATH = [cwd] +CPPPATH = [cwd] CPPDEFINES = ['RT_USING_DLIBC'] if rtconfig.PLATFORM == 'iar': if GetDepend('RT_USING_DFS'): - CPPDEFINES = CPPDEFINES + ['_DLIB_FILE_DESCRIPTOR', '_DLIB_THREAD_SUPPORT'] + from distutils.version import LooseVersion + from iar import IARVersion + + CPPDEFINES = CPPDEFINES + ['_DLIB_FILE_DESCRIPTOR'] + + if LooseVersion(IARVersion()) < LooseVersion("8.20.1"): + CPPDEFINES = CPPDEFINES + ['_DLIB_THREAD_SUPPORT'] group = DefineGroup('dlib', src, depend = ['RT_USING_LIBC'], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES) |