summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2011-01-03 21:10:15 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2011-01-03 21:10:15 +0000
commit26a8af2cbc6c01792dbc47c4dab3635b0021dc03 (patch)
tree881b7311c5bbd2bc3b8edf96fefd1f01c8905d1f /Makefile
parentba89b95888028a8eb16cd0050f5fd47f586763e4 (diff)
downloadnetsurf-26a8af2cbc6c01792dbc47c4dab3635b0021dc03.tar.gz
netsurf-26a8af2cbc6c01792dbc47c4dab3635b0021dc03.tar.bz2
Look for toolchain in /opt/netsurf/arm-unknown-riscos/cross/bin in preference to /home/riscos/cross/bin
svn path=/trunk/netsurf/; revision=11189
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile18
1 files changed, 16 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index cccd52b21..9ed900e98 100644
--- a/Makefile
+++ b/Makefile
@@ -134,8 +134,22 @@ ifeq ($(TARGET),riscos)
else
# Cross-build for RO (either using GCCSDK 3.4.6 - AOF,
# either using GCCSDK 4 - ELF)
- GCCSDK_INSTALL_ENV ?= /home/riscos/env
- GCCSDK_INSTALL_CROSSBIN ?= /home/riscos/cross/bin
+ ifeq ($(origin GCCSDK_INSTALL_ENV),undefined)
+ ifneq ($(realpath /opt/netsurf/arm-unknown-riscos/env),)
+ GCCSDK_INSTALL_ENV := /opt/netsurf/arm-unknown-riscos/env
+ else
+ GCCSDK_INSTALL_ENV := /home/riscos/env
+ endif
+ endif
+
+ ifeq ($(origin GCCSDK_INSTALL_CROSSBIN),undefined)
+ ifneq ($(realpath /opt/netsurf/arm-unknown-riscos/cross/bin),)
+ GCCSDK_INSTALL_CROSSBIN := /opt/netsurf/arm-unknown-riscos/cross/bin
+ else
+ GCCSDK_INSTALL_CROSSBIN := /home/riscos/cross/bin
+ endif
+ endif
+
CCRES := $(GCCSDK_INSTALL_CROSSBIN)/ccres
TPLEXT := ,fec
MAKERUN := $(GCCSDK_INSTALL_CROSSBIN)/makerun