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':