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 #4822 from JojoS62/fix-makefile-exporter 

fix unresolved linker msg: __wrap_
pull/4887/merge
Jimmy Brisson 2017-08-10 09:36:56 -05:00 committed by GitHub
parent 61d486a10e 0c254448e0
commit 92ac0abca5
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -200,7 +200,9 @@ class GccArm(Makefile):
@staticmethod
def prepare_lib(libname):
return "-l:" + libname
if "lib" == libname[:3]:
libname = libname[3:-2]
return "-l" + libname
@staticmethod
def prepare_sys_lib(libname):

2
tools/export/makefile/make-gcc-arm.tmpl
View File

@ -1,6 +1,6 @@
{% extends "makefile/Makefile.tmpl" %}
{%- block sys_libs -%} -Wl,--start-group {{ld_sys_libs|join(" ")}} -Wl,--end-group {%- endblock -%}
{%- block sys_libs -%} -Wl,--start-group {{ld_sys_libs|join(" ")}} {{libraries|join(" ")}} -Wl,--end-group {%- endblock -%}
{% block elf2bin %}
$(ELF2BIN) -O binary $< $@