summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Kendrick <rob.kendrick@codethink.co.uk>2014-11-16 16:28:10 (GMT)
committer Rob Kendrick <rob.kendrick@codethink.co.uk>2014-11-16 16:28:10 (GMT)
commit858429a5821436fe01b812ca4215a58598a3e0a2 (patch)
treeb9e1f31dd0e39c734b6aafe9ed4234d31f8bc821
parent388d9098dc3578a41e07d720ba3708012c0a10e2 (diff)
parent1e67635045e1c09cf4af451b7265f233b2d09b8a (diff)
downloadtoolchains-rjek/gccsdk-4.7.4.tar.gz
toolchains-rjek/gccsdk-4.7.4.tar.bz2
Merge branch 'rjek/gccsdk-4.7.4' of ssh://git.netsurf-browser.org/toolchains into rjek/gccsdk-4.7.4rjek/gccsdk-4.7.4
-rw-r--r--arm-unknown-riscos/Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/arm-unknown-riscos/Makefile b/arm-unknown-riscos/Makefile
index 264eeac..6fd6be9 100644
--- a/arm-unknown-riscos/Makefile
+++ b/arm-unknown-riscos/Makefile
@@ -113,6 +113,9 @@ $(BUILDSTEPS)/oslib.d: $(BUILDSTEPS)/gcc.d $(SOURCESDIR)/$(UPSTREAM_OSLIB_TARBAL
$(BUILDSTEPS)/gcc.d: $(BUILDSTEPS)/gccsdk-srcdir.d
cd $(BUILDDIR)/gcc4 && make
cd $(BUILDDIR)/gcc4 && ./install-env
+ @# Newer GCCSDK adds these trampoline binaries that for us
+ @# serve no purpose and get in the way.
+ $(RM) $(PREFIX)/cross/bin/arm-unknown-riscos-gcc-ar $(PREFIX)/cross/bin/arm-unknown-riscos-gcc-nm $(PREFIX)/cross/bin/arm-unknown-riscos-gcc-ranlib
touch $@
$(BUILDSTEPS)/gccsdk-srcdir.d: $(BUILDSTEPS)/buildsteps.d $(SOURCESDIR)/$(UPSTREAM_GCCSDK_TARBALL)