Skip to content

Commit 5018270

Browse files
committed
uvision - asm flags fix
Use deepcopy to get flags as they are shared between ARM and uARM. asm flags for command line require c flags as it used to be.
1 parent ee00dbd commit 5018270

File tree

1 file changed

+3
-2
lines changed
  • workspace_tools/toolchains

1 file changed

+3
-2
lines changed

workspace_tools/toolchains/arm.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"""
1717
import re
1818
from os.path import join
19+
import copy
1920

2021
from workspace_tools.toolchains import mbedToolchain
2122
from workspace_tools.settings import ARM_BIN, ARM_INC, ARM_LIB, MY_ARM_CLIB, ARM_CPPLIB
@@ -54,7 +55,7 @@ def __init__(self, target, options=None, notify=None, macros=None, silent=False,
5455

5556
main_cc = join(ARM_BIN, "armcc")
5657

57-
self.flags = self.DEFAULT_FLAGS
58+
self.flags = copy.deepcopy(self.DEFAULT_FLAGS)
5859
self.flags['common'] += ["--cpu=%s" % cpu]
5960
if "save-asm" in self.options:
6061
self.flags['common'].extend(["--asm", "--interleave"])
@@ -65,7 +66,7 @@ def __init__(self, target, options=None, notify=None, macros=None, silent=False,
6566
else:
6667
self.flags['c'].append("-O3")
6768

68-
self.asm = [main_cc] + self.flags['common'] + self.flags['asm']
69+
self.asm = [main_cc] + self.flags['common'] + self.flags['asm'] + self.flags['c']
6970
if not "analyze" in self.options:
7071
self.cc = [main_cc] + self.flags['common'] + self.flags['c']
7172
self.cppc = [main_cc] + self.flags['common'] + self.flags['c'] + self.flags['cxx']

0 commit comments

Comments
 (0)