Merge pull request #4822 from JojoS62/fix-makefile-exporter

fix unresolved linker msg: __wrap_

Author: theotherjimmy

tools/export/makefile/__init__.py

@@ -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):

tools/export/makefile/make-gcc-arm.tmpl

@@ -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 $< $@