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

De-duplicate the include paths. Without this all compiles are passed include paths twice

Mihail Stoyanov 2016-05-06 12:18:07 +01:00 committed by Mihail Stoyanov
parent 868942a148
commit f01e1363d1
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/toolchains/__init__.py
View File

@ -485,13 +485,11 @@ class mbedToolchain:
self.compiled = 0 self.compiled = 0
self.temp_dir = build_path self.temp_dir = build_path
#for i in self.build_params:
# self.debug(i)
# self.debug("%s" % self.build_params[i])
inc_paths = resources.inc_dirs inc_paths = resources.inc_dirs
if inc_dirs is not None: if inc_dirs is not None:
inc_paths.extend(inc_dirs) inc_paths.extend(inc_dirs)
# De-duplicate include paths and sort for consistency
inc_paths = sorted(set(inc_paths))
objects = [] objects = []
queue = [] queue = []
@ -499,6 +497,7 @@ class mbedToolchain:
# The dependency checking for C/C++ is delegated to the compiler # The dependency checking for C/C++ is delegated to the compiler
base_path = resources.base_path base_path = resources.base_path
# Sort compile queue for consistency
files_to_compile.sort() files_to_compile.sort()
work_dir = getcwd() work_dir = getcwd()