From 570627b72f75cb39fbb602143f8edc9146e0507c Mon Sep 17 00:00:00 2001 From: liang yongxiang Date: Sat, 7 Apr 2018 00:43:28 +0800 Subject: [Libc][dlib] Auto remove macro _DLIB_THREAD_SUPPORT when IAR version higher than 8.20.1 --- components/libc/compilers/dlib/SConscript | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'components/libc/compilers/dlib/SConscript') diff --git a/components/libc/compilers/dlib/SConscript b/components/libc/compilers/dlib/SConscript index 8ae7484894..47fa8de83d 100644 --- a/components/libc/compilers/dlib/SConscript +++ b/components/libc/compilers/dlib/SConscript @@ -1,4 +1,7 @@ from building import * +from distutils.version import LooseVersion +from iar import IARVersion + Import('rtconfig') src = Glob('*.c') @@ -11,7 +14,10 @@ CPPDEFINES = ['RT_USING_DLIBC'] if rtconfig.PLATFORM == 'iar': if GetDepend('RT_USING_DFS'): - CPPDEFINES = CPPDEFINES + ['_DLIB_FILE_DESCRIPTOR', '_DLIB_THREAD_SUPPORT'] + 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) -- cgit v1.3.1 From 74d045093bb4bda0d710c32c1a815aa672742c17 Mon Sep 17 00:00:00 2001 From: Bernard Xiong Date: Sun, 15 Apr 2018 14:39:35 +0800 Subject: [tools] Fix the sys.path issue in IARVersion. --- components/libc/compilers/dlib/SConscript | 7 ++++--- tools/building.py | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'components/libc/compilers/dlib/SConscript') diff --git a/components/libc/compilers/dlib/SConscript b/components/libc/compilers/dlib/SConscript index 47fa8de83d..456b762496 100644 --- a/components/libc/compilers/dlib/SConscript +++ b/components/libc/compilers/dlib/SConscript @@ -1,6 +1,4 @@ from building import * -from distutils.version import LooseVersion -from iar import IARVersion Import('rtconfig') @@ -8,12 +6,15 @@ src = Glob('*.c') cwd = GetCurrentDir() group = [] -CPPPATH = [cwd] +CPPPATH = [cwd] CPPDEFINES = ['RT_USING_DLIBC'] if rtconfig.PLATFORM == 'iar': if GetDepend('RT_USING_DFS'): + from distutils.version import LooseVersion + from iar import IARVersion + CPPDEFINES = CPPDEFINES + ['_DLIB_FILE_DESCRIPTOR'] if LooseVersion(IARVersion()) < LooseVersion("8.20.1"): diff --git a/tools/building.py b/tools/building.py index 990e57edcd..1a49d3c3a0 100644 --- a/tools/building.py +++ b/tools/building.py @@ -124,6 +124,7 @@ def PrepareBuilding(env, root_directory, has_libcpu=False, remove_components = [ Env = env Rtt_Root = os.path.abspath(root_directory) + sys.path = sys.path + [os.path.join(Rtt_Root, 'tools')] # add compability with Keil MDK 4.6 which changes the directory of armcc.exe if rtconfig.PLATFORM == 'armcc': -- cgit v1.3.1