summaryrefslogtreecommitdiffstats
path: root/firmware/firmware.make
diff options
context:
space:
mode:
authorFrank Gevaerts <frank@gevaerts.be>2019-07-19 15:16:37 +0200
committerFrank Gevaerts <frank@gevaerts.be>2019-07-19 15:16:37 +0200
commitb0de98ad3b1391ec0dfe4f8eced0a6833490cd8f (patch)
treefd5f2b9ca3b0825bb180e18f4396f77d41bc6da7 /firmware/firmware.make
parent8bd992c5035bfee6aedbcae7669be5b823537aad (diff)
downloadrockbox-b0de98ad3b1391ec0dfe4f8eced0a6833490cd8f.tar.gz
rockbox-b0de98ad3b1391ec0dfe4f8eced0a6833490cd8f.tar.bz2
rockbox-b0de98ad3b1391ec0dfe4f8eced0a6833490cd8f.zip
Put -lfirmware in CORE_LIBS, to fix -thumb builds
For unknown reasons, -thumb builds need -lfirmware after -lrbcodec (but still before -lunwarminder)i. Other builds are still happy if we do that. Including it via CORE_LIBS instead of explicitly achieves that. Change-Id: Id69e4a0c042f90f71cfd9a72202ce4d8ef6a4181
Diffstat (limited to 'firmware/firmware.make')
-rw-r--r--firmware/firmware.make2
1 files changed, 2 insertions, 0 deletions
diff --git a/firmware/firmware.make b/firmware/firmware.make
index 3d79837871..6c01250bde 100644
--- a/firmware/firmware.make
+++ b/firmware/firmware.make
@@ -52,6 +52,8 @@ $(BUILDDIR)/sysfont.o: $(SYSFONT) $(BUILDDIR)/sysfont.h
SVNVERSION:=$(shell VERSION='$(VERSION)' $(TOOLSDIR)/version.sh $(ROOTDIR))
OLDSVNVERSION:=$(shell grep 'RBVERSION' $(BUILDDIR)/rbversion.h 2>/dev/null|cut -d '"' -f 2 || echo "NOREVISION")
+CORE_LIBS:=$(FIRMLIB)
+
ifneq ($(SVNVERSION),$(OLDSVNVERSION))
.PHONY: $(BUILDDIR)/rbversion.h
endif