From be72993ee2c072112e5e751cb6c6b32e44730ec4 Mon Sep 17 00:00:00 2001 From: JojoS Date: Thu, 27 Jul 2017 22:24:21 +0200 Subject: [PATCH] fix unresolved linker msg: __wrap_ adding libraries to gcc linker group command --- tools/export/makefile/__init__.py | 2 +- tools/export/makefile/make-gcc-arm.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/export/makefile/__init__.py b/tools/export/makefile/__init__.py index d3129143f3..8405a85fbc 100644 --- a/tools/export/makefile/__init__.py +++ b/tools/export/makefile/__init__.py @@ -200,7 +200,7 @@ class GccArm(Makefile): @staticmethod def prepare_lib(libname): - return "-l:" + libname + return "-l" + libname[3:-2] @staticmethod def prepare_sys_lib(libname): diff --git a/tools/export/makefile/make-gcc-arm.tmpl b/tools/export/makefile/make-gcc-arm.tmpl index 3b89b294ab..5231c65b88 100644 --- a/tools/export/makefile/make-gcc-arm.tmpl +++ b/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 $< $@