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

Use cflags instead of symbols

pull/2577/head
Jimmy Brisson 2016-08-23 18:50:55 -05:00
parent 6838aa9372
commit d9c8365828
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tools/export/makefile/Makefile.tmpl
View File

@ -42,8 +42,6 @@ VPATH = {{vpath|join(" ")}}
PROJECT := {{name}} PROJECT := {{name}}
{% for sym in symbols %}CC_SYMBOLS += -D{{sym}}
{% endfor %}
# Project settings # Project settings
############################################################################### ###############################################################################
@ -74,6 +72,13 @@ SREC_CAT = srec_cat
{%- endif %} {%- endif %}
{%- block additional_executables -%}{%- endblock %} {%- block additional_executables -%}{%- endblock %}
{% for flag in c_flags %}C_FLAGS += {{flag}}
{% endfor %}
{% for flag in cxx_flags %}CXX_FLAGS += {{flag}}
{% endfor %}
{% for flag in asm_flags %}ASM_FLAGS += {{flag}}
{% endfor %}
LD_FLAGS :={%- block ld_flags -%} {{ld_flags|join(" ")}} {% endblock %} LD_FLAGS :={%- block ld_flags -%} {{ld_flags|join(" ")}} {% endblock %}
{% block sys_libs -%}{%- endblock %} {% block sys_libs -%}{%- endblock %}
@ -91,21 +96,21 @@ all: $(PROJECT).bin $(PROJECT).hex size
.asm.o: .asm.o:
+@$(call MAKEDIR,$(dir $@)) +@$(call MAKEDIR,$(dir $@))
$(AS) -c $(CC_SYMBOLS) $(INCLUDE_PATHS) -o $@ $< $(AS) -c $(ASM_FLAGS) $(INCLUDE_PATHS) -o $@ $<
.s.o: .s.o:
+@$(call MAKEDIR,$(dir $@)) +@$(call MAKEDIR,$(dir $@))
$(AS) -c $(CC_SYMBOLS) $(INCLUDE_PATHS) -o $@ $< $(AS) -c $(ASM_FLAGS) $(INCLUDE_PATHS) -o $@ $<
.S.o: .S.o:
+@$(call MAKEDIR,$(dir $@)) +@$(call MAKEDIR,$(dir $@))
$(AS) -c $(CC_SYMBOLS) $(INCLUDE_PATHS) -o $@ $< $(AS) -c $(ASM_FLAGS) $(INCLUDE_PATHS) -o $@ $<
.c.o: .c.o:
+@$(call MAKEDIR,$(dir $@)) +@$(call MAKEDIR,$(dir $@))
$(CC) $(CC_SYMBOLS) $(INCLUDE_PATHS) -o $@ $< $(CC) $(C_FLAGS) $(INCLUDE_PATHS) -o $@ $<
.cpp.o: .cpp.o:
+@$(call MAKEDIR,$(dir $@)) +@$(call MAKEDIR,$(dir $@))
$(CPP) $(CC_SYMBOLS) $(INCLUDE_PATHS) -o $@ $< $(CPP) $(CXX_FLAGS) $(INCLUDE_PATHS) -o $@ $<
{% block target_project_elf %} {% block target_project_elf %}
$(PROJECT).elf: $(OBJECTS) $(SYS_OBJECTS) $(LINKER_SCRIPT) $(PROJECT).elf: $(OBJECTS) $(SYS_OBJECTS) $(LINKER_SCRIPT)

9
tools/export/makefile/__init__.py
View File

@ -40,9 +40,9 @@ class Makefile(Exporter):
self.resources.win_to_unix() self.resources.win_to_unix()
to_be_compiled = [splitext(src)[0] + ".o" for src in to_be_compiled = [splitext(src)[0] + ".o" for src in
self.resources['s_sources'] + self.resources.s_sources +
self.resources['c_sources'] + self.resources.c_sources +
self.resources['cpp_sources']] self.resources.cpp_sources]
libraries = [splitext(lib)[0][3:] for lib in self.resources.libraries] libraries = [splitext(lib)[0][3:] for lib in self.resources.libraries]
@ -54,7 +54,6 @@ class Makefile(Exporter):
'library_paths': self.resources.lib_dirs, 'library_paths': self.resources.lib_dirs,
'linker_script': self.resources.linker_script, 'linker_script': self.resources.linker_script,
'libraries': libraries, 'libraries': libraries,
'symbols': self.toolchain.get_symbols(),
'hex_files': self.resources.hex_files, 'hex_files': self.resources.hex_files,
'vpath': (["../../.."] 'vpath': (["../../.."]
if (basename(dirname(dirname(self.export_dir))) if (basename(dirname(dirname(self.export_dir)))
@ -78,7 +77,7 @@ class Makefile(Exporter):
if "../." not in ctx["include_paths"]: if "../." not in ctx["include_paths"]:
ctx["include_paths"] += ['../.'] ctx["include_paths"] += ['../.']
for key in ['include_paths', 'library_paths', 'hex_files', for key in ['include_paths', 'library_paths', 'hex_files',
'to_be_compiled', 'symbols']: 'to_be_compiled']:
ctx[key] = sorted(ctx[key]) ctx[key] = sorted(ctx[key])
ctx.update(self.flags) ctx.update(self.flags)