ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #5093 from theotherjimmy/export-no-response-files 

Disable response files on export
pull/5116/head
Jimmy Brisson 2017-09-14 11:24:36 -05:00 committed by GitHub
parent 7b428916f5 a62f89da05
commit 0906be6397
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/export/__init__.py
View File

@ -310,6 +310,7 @@ def export_project(src_paths, export_path, target, ide, libraries_paths=None,
extra_verbose=extra_verbose, config=config, build_profile=build_profile, extra_verbose=extra_verbose, config=config, build_profile=build_profile,
app_config=app_config) app_config=app_config)
# The first path will give the name to the library # The first path will give the name to the library
toolchain.RESPONSE_FILES = False
if name is None: if name is None:
name = basename(normpath(abspath(src_paths[0]))) name = basename(normpath(abspath(src_paths[0])))

2
tools/export/makefile/__init__.py
View File

@ -225,7 +225,7 @@ class Arm(Makefile):
def generate(self): def generate(self):
if self.resources.linker_script: if self.resources.linker_script:
new_script = self.toolchain.make_real_scatter( new_script = self.toolchain.correct_scatter_shebang(
self.resources.linker_script) self.resources.linker_script)
if new_script is not self.resources.linker_script: if new_script is not self.resources.linker_script:
self.resources.linker_script = new_script self.resources.linker_script = new_script

5
tools/export/uvision/__init__.py
View File

@ -167,8 +167,9 @@ class Uvision(Exporter):
"""Format toolchain flags for Uvision""" """Format toolchain flags for Uvision"""
flags = copy.deepcopy(self.flags) flags = copy.deepcopy(self.flags)
# to be preprocessed with armcc # to be preprocessed with armcc
asm_flag_string = '--cpreproc --cpreproc_opts=-D__ASSERT_MSG,' + \ asm_flag_string = (
",".join(flags['asm_flags']) '--cpreproc --cpreproc_opts=-D__ASSERT_MSG,' +
",".join(filter(lambda f: f.startswith("-D"), flags['asm_flags'])))
flags['asm_flags'] = asm_flag_string flags['asm_flags'] = asm_flag_string
# All non-asm flags are in one template field # All non-asm flags are in one template field
c_flags = list(set(flags['c_flags'] + flags['cxx_flags'] +flags['common_flags'])) c_flags = list(set(flags['c_flags'] + flags['cxx_flags'] +flags['common_flags']))

2
tools/export/uvision/uvision.tmpl
View File

@ -394,7 +394,7 @@
<MiscControls>{{asm_flags}}</MiscControls> <MiscControls>{{asm_flags}}</MiscControls>
<Define></Define> <Define></Define>
<Undefine></Undefine> <Undefine></Undefine>
<IncludePath></IncludePath> <IncludePath>{{include_paths}}</IncludePath>
</VariousControls> </VariousControls>
</Aads> </Aads>
<LDads> <LDads>