Skip to content

Commit 4219d9c

Browse files
committed
Don't set the build_dir to anything on export
When constructing a toolchain for export, we currently set the `build_dir` to the `export_dir`. When exporting offline, the `export_dir` is always set to the root of the project. The toolchains ignore their `build_dir` when scanning for sorces, so when the exporters use the toolchains to scan for their resources, they get nothing. In this patch we set the `build_dir` of the toolchain that the exports use to nothing. A path of nothing should not match anything, and will therefore not ignore everything when scanning for resources.
1 parent 67f8092 commit 4219d9c

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

tools/export/gnuarmeclipse/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ def generate(self):
207207
src_paths = ['']
208208
target_name = self.toolchain.target.name
209209
toolchain = prepare_toolchain(
210-
src_paths, target_name, self.TOOLCHAIN, build_profile=profile_toolchain)
210+
src_paths, "", target_name, self.TOOLCHAIN, build_profile=profile_toolchain)
211211

212212
# Hack to fill in build_dir
213213
toolchain.build_dir = self.toolchain.build_dir

tools/project_api.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ def export_project(src_paths, export_path, target, ide, libraries_paths=None,
187187

188188
# Pass all params to the unified prepare_resources()
189189
toolchain = prepare_toolchain(
190-
paths, export_path, target, toolchain_name, macros=macros, jobs=jobs,
190+
paths, "", target, toolchain_name, macros=macros, jobs=jobs,
191191
notify=notify, silent=silent, verbose=verbose,
192192
extra_verbose=extra_verbose, config=config, build_profile=build_profile)
193193
# The first path will give the name to the library

0 commit comments

Comments
 (0)