Merge pull request #9765 from kfnta/asm_config

Add config header to assembly compilation
pull/9799/head
Martin Kojtal 2019-02-20 11:51:57 +01:00 committed by GitHub
commit 3aeff7ae25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions

View File

@ -473,14 +473,13 @@ class ARMC6(ARM_STD):
def get_compile_options(self, defines, includes, for_asm=False):
opts = ['-D%s' % d for d in defines]
opts.extend(["-I%s" % i for i in includes if i])
config_header = self.get_config_header()
if config_header:
opts.extend(self.get_config_option(config_header))
if for_asm:
return ["--cpreproc",
"--cpreproc_opts=%s" % ",".join(self.flags['common'] + opts)]
else:
config_header = self.get_config_header()
if config_header:
opts.extend(self.get_config_option(config_header))
return opts
return opts
@hook_tool
def assemble(self, source, object, includes):