Merge pull request #3924 from theotherjimmy/fix-export-build-dir

Don't set the build_dir to anything on export
pull/3536/merge
Sam Grove 2017-03-22 12:04:34 +00:00 committed by GitHub
commit 16304ae18d
2 changed files with 2 additions and 2 deletions

View File

@ -207,7 +207,7 @@ class GNUARMEclipse(Exporter):
src_paths = ['']
target_name = self.toolchain.target.name
toolchain = prepare_toolchain(
src_paths, target_name, self.TOOLCHAIN, build_profile=profile_toolchain)
src_paths, "", target_name, self.TOOLCHAIN, build_profile=profile_toolchain)
# Hack to fill in build_dir
toolchain.build_dir = self.toolchain.build_dir

View File

@ -187,7 +187,7 @@ def export_project(src_paths, export_path, target, ide, libraries_paths=None,
# Pass all params to the unified prepare_resources()
toolchain = prepare_toolchain(
paths, export_path, target, toolchain_name, macros=macros, jobs=jobs,
paths, "", target, toolchain_name, macros=macros, jobs=jobs,
notify=notify, silent=silent, verbose=verbose,
extra_verbose=extra_verbose, config=config, build_profile=build_profile)
# The first path will give the name to the library