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 #5 from 0xc0170/fix_project 

Tools - project options.macros None fix
Bogdan Marinescu 2016-04-07 09:14:52 +01:00
parent 4ae6b059e0 a058ab98a4
commit 0b593484db
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/project.py
View File

@ -145,7 +145,9 @@ if __name__ == '__main__':
project_dir = options.source_dir project_dir = options.source_dir
project_name = basename(project_dir) project_name = basename(project_dir)
project_temp = project_dir project_temp = project_dir
lib_symbols = [] + options.macros lib_symbols = []
if options.macros:
lib_symbols += options.macros
zip = False # don't create zip zip = False # don't create zip
clean = False # don't cleanup because we use the actual source tree to generate IDE files clean = False # don't cleanup because we use the actual source tree to generate IDE files
else: else:
@ -179,7 +181,9 @@ if __name__ == '__main__':
# Some libraries have extra macros (called by exporter symbols) to we need to pass # Some libraries have extra macros (called by exporter symbols) to we need to pass
# them to maintain compilation macros integrity between compiled library and # them to maintain compilation macros integrity between compiled library and
# header files we might use with it # header files we might use with it
lib_symbols = [] + options.macros lib_symbols = []
if options.macros:
lib_symbols += options.macros
for lib in LIBRARIES: for lib in LIBRARIES:
if lib['build_dir'] in test.dependencies: if lib['build_dir'] in test.dependencies:
lib_macros = lib.get('macros', None) lib_macros = lib.get('macros', None)