From 91da451a3d174546676c90998d4f47230ed44873 Mon Sep 17 00:00:00 2001 From: Kyle Fleming Date: Mon, 12 Feb 2018 17:58:26 -0800 Subject: [PATCH] Add non-archived dependencies matcher to linker Ensures that dependencies with the build setting `"libArchive": false` (e.g. GDBStub) are linked properly when using PlatformIO. --- tools/sdk/ld/eagle.app.v6.common.ld | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/sdk/ld/eagle.app.v6.common.ld b/tools/sdk/ld/eagle.app.v6.common.ld index c9993c7bba..9921577172 100644 --- a/tools/sdk/ld/eagle.app.v6.common.ld +++ b/tools/sdk/ld/eagle.app.v6.common.ld @@ -96,8 +96,11 @@ SECTIONS *.pioenvs\\*\\lib*.a:(EXCLUDE_FILE (umm_malloc.o) .literal*, EXCLUDE_FILE (umm_malloc.o) .text*) *.pioenvs/*/lib*.a:(EXCLUDE_FILE (umm_malloc.o) .literal*, EXCLUDE_FILE (umm_malloc.o) .text*) /* project dependencies */ - *.pioenvs\\*\\lib*\lib*.a:(.literal*, .text*) + *.pioenvs\\*\\lib*\\lib*.a:(.literal*, .text*) *.pioenvs/*/lib*/lib*.a:(.literal*, .text*) + /* non-archived project dependencies */ + *.pioenvs\\*\\lib*\\*.o(.literal*, .text*) + *.pioenvs/*/lib*/*.o(.literal*, .text*) /* project source objects */ *.pioenvs\\*\\src\\*.o(.literal*, .text*) *.pioenvs/*/src/*.o(.literal*, .text*) @@ -173,6 +176,9 @@ SECTIONS /* project dependencies */ *.pioenvs\\*\\lib*\\lib*.a:(.iram.text) *.pioenvs/*/lib*/lib*.a:(.iram.text) + /* non-archived project dependencies */ + *.pioenvs\\*\\lib*\\*.o(.iram.text) + *.pioenvs/*/lib*/*.o(.iram.text) /* project source objects */ *.pioenvs\\*\\src\\*.o(.iram.text) *.pioenvs/*/src/*.o(.iram.text)