summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author[email protected] <[email protected]>2012-12-13 05:24:41 +0000
committer[email protected] <[email protected]>2012-12-13 05:24:41 +0000
commit5811daec0ccef2df15e8b1184d1f87ec8aeaffdc (patch)
tree9844044da18702fb415ab1ca36119cda8fd95237
parent56ab153b1c92ccfc3695adf9fe8bef3e5230369d (diff)
add compability with MDK 4.6 which changes directory of armcc.exe
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@2479 bbd45198-f89e-11dd-88c7-29a3b14d5316
-rw-r--r--tools/building.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/building.py b/tools/building.py
index 6ae8d32e5f..8418ccd3eb 100644
--- a/tools/building.py
+++ b/tools/building.py
@@ -43,6 +43,12 @@ def PrepareBuilding(env, root_directory, has_libcpu=False, remove_components = [
Env = env
Rtt_Root = root_directory
+ # add compability with Keil MDK 4.6 which changes the directory of armcc.exe
+ if rtconfig.PLATFORM == 'armcc':
+ if not os.path.isfile(os.path.join(rtconfig.EXEC_PATH, 'armcc.exe')):
+ if rtconfig.EXEC_PATH.find('bin40') > 0:
+ rtconfig.EXEC_PATH = rtconfig.EXEC_PATH.replace('bin40', 'armcc/bin')
+
# patch for win32 spawn
if env['PLATFORM'] == 'win32' and rtconfig.PLATFORM == 'gcc':
win32_spawn = Win32Spawn()