Skip to content

Disable response files on export #5093

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 14, 2017
Merged

Disable response files on export #5093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3e1b96d
Disable response files on export
theotherjimmy Sep 13, 2017
8db0fa9
Correct rename mistake in make arm compiler exporters
theotherjimmy Sep 14, 2017
a62f89d
Correct uvision template to correctly pass include paths
theotherjimmy Sep 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions tools/export/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
app_config=app_config)
# The first path will give the name to the library
toolchain.RESPONSE_FILES = False
if name is None:
name = basename(normpath(abspath(src_paths[0])))

Expand Down
2 changes: 1 addition & 1 deletion tools/export/makefile/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ def prepare_sys_lib(libname):

def generate(self):
if self.resources.linker_script:
new_script = self.toolchain.make_real_scatter(
new_script = self.toolchain.correct_scatter_shebang(
self.resources.linker_script)
if new_script is not self.resources.linker_script:
self.resources.linker_script = new_script
Expand Down
5 changes: 3 additions & 2 deletions tools/export/uvision/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,9 @@ def format_flags(self):
"""Format toolchain flags for Uvision"""
flags = copy.deepcopy(self.flags)
# to be preprocessed with armcc
asm_flag_string = '--cpreproc --cpreproc_opts=-D__ASSERT_MSG,' + \
",".join(flags['asm_flags'])
asm_flag_string = (
'--cpreproc --cpreproc_opts=-D__ASSERT_MSG,' +
",".join(filter(lambda f: f.startswith("-D"), flags['asm_flags'])))
flags['asm_flags'] = asm_flag_string
# All non-asm flags are in one template field
c_flags = list(set(flags['c_flags'] + flags['cxx_flags'] +flags['common_flags']))
Expand Down
2 changes: 1 addition & 1 deletion tools/export/uvision/uvision.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@
<MiscControls>{{asm_flags}}</MiscControls>
<Define></Define>
<Undefine></Undefine>
<IncludePath></IncludePath>
<IncludePath>{{include_paths}}</IncludePath>
</VariousControls>
</Aads>
<LDads>
Expand Down