Skip to content

Commit 3aeff7a

Browse files
authored
Merge pull request #9765 from kfnta/asm_config
Add config header to assembly compilation
2 parents 2d30d0f + 156bdc4 commit 3aeff7a

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

tools/toolchains/arm.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -473,14 +473,13 @@ def get_config_option(self, config_header):
473473
def get_compile_options(self, defines, includes, for_asm=False):
474474
opts = ['-D%s' % d for d in defines]
475475
opts.extend(["-I%s" % i for i in includes if i])
476+
config_header = self.get_config_header()
477+
if config_header:
478+
opts.extend(self.get_config_option(config_header))
476479
if for_asm:
477480
return ["--cpreproc",
478481
"--cpreproc_opts=%s" % ",".join(self.flags['common'] + opts)]
479-
else:
480-
config_header = self.get_config_header()
481-
if config_header:
482-
opts.extend(self.get_config_option(config_header))
483-
return opts
482+
return opts
484483

485484
@hook_tool
486485
def assemble(self, source, object, includes):

0 commit comments

Comments
 (0)