From 74d045093bb4bda0d710c32c1a815aa672742c17 Mon Sep 17 00:00:00 2001
From: Bernard Xiong <bernard.xiong@gmail.com>
Date: Sun, 15 Apr 2018 14:39:35 +0800
Subject: [PATCH] [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(-)

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