From ca67b4d18e90a1e3bd45497267121555bc830a2d Mon Sep 17 00:00:00 2001 From: liruncong Date: Sat, 14 Sep 2019 22:36:19 +0800 Subject: [PATCH] =?UTF-8?q?[tools]armclang=E5=BA=93=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools/building.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/building.py b/tools/building.py index f19b76d0e3..3b593b4960 100644 --- a/tools/building.py +++ b/tools/building.py @@ -281,8 +281,8 @@ def PrepareBuilding(env, root_directory, has_libcpu=False, remove_components = [ utils.ReloadModule(rtconfig) # 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.PLATFORM == 'armcc' or rtconfig.PLATFORM == 'armclang': + if rtconfig.PLATFORM == 'armcc' and 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') Env['LINKFLAGS'] = Env['LINKFLAGS'].replace('RV31', 'armcc')