summaryrefslogtreecommitdiff
path: root/arm-unknown-riscos/Makefile
diff options
context:
space:
mode:
authorJohn-Mark Bell <jmb@netsurf-browser.org>2015-11-13 03:11:30 +0000
committerJohn-Mark Bell <jmb@netsurf-browser.org>2015-11-13 03:11:30 +0000
commitb9b1084efe62a75c566bc4b72e9d6beac48955bc (patch)
tree40128ac69d507b82bd4826bb501f97001cdf6517 /arm-unknown-riscos/Makefile
parent4b747316f5135ecfcd461ea1ee0abcb92470c58c (diff)
downloadtoolchains-b9b1084efe62a75c566bc4b72e9d6beac48955bc.tar.gz
toolchains-b9b1084efe62a75c566bc4b72e9d6beac48955bc.tar.bz2
RISC OS: fix up tooling for GCCSDK 4.7.4r2
* Makefile: Update to reflect upstream tree structure * recipes/patches/gcc4/binutils-plugins.p, recipes/patches/gcc4/gmp-force-build.p: Refresh context * recipes/patches/gcc4/python2.5.p: Drop: Python 2.5 is ancient * recipes/patches/gcc4/riscos.md.p: Drop: merged upstream
Diffstat (limited to 'arm-unknown-riscos/Makefile')
-rw-r--r--arm-unknown-riscos/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/arm-unknown-riscos/Makefile b/arm-unknown-riscos/Makefile
index 78d4814..052a414 100644
--- a/arm-unknown-riscos/Makefile
+++ b/arm-unknown-riscos/Makefile
@@ -111,8 +111,8 @@ $(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
+ cd $(BUILDDIR)/gcc4/gcc4 && make
+ cd $(BUILDDIR)/gcc4/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
@@ -120,8 +120,8 @@ $(BUILDSTEPS)/gcc.d: $(BUILDSTEPS)/gccsdk-srcdir.d
$(BUILDSTEPS)/gccsdk-srcdir.d: $(BUILDSTEPS)/buildsteps.d $(SOURCESDIR)/$(UPSTREAM_GCCSDK_TARBALL)
cp -r $(SOURCESDIR)/$(UPSTREAM_GCCSDK_TARBALL) $(BUILDDIR)/gcc4
- cp -p $(RECIPES)/files/gcc4/gccsdk-params $(BUILDDIR)/gcc4/gccsdk-params
- sed -i 's#{PREFIX}#$(PREFIX)#' $(BUILDDIR)/gcc4/gccsdk-params
+ cp -p $(RECIPES)/files/gcc4/gccsdk-params $(BUILDDIR)/gcc4/gcc4/gccsdk-params
+ sed -i 's#{PREFIX}#$(PREFIX)#' $(BUILDDIR)/gcc4/gcc4/gccsdk-params
for p in `ls $(RECIPES)/patches/gcc4/*.p` ; do patch -d $(BUILDDIR)/gcc4 -p0 <$$p ; done
touch $@