From 26a8af2cbc6c01792dbc47c4dab3635b0021dc03 Mon Sep 17 00:00:00 2001
From: John Mark Bell <jmb@netsurf-browser.org>
Date: Mon, 3 Jan 2011 21:10:15 +0000
Subject: Look for toolchain in /opt/netsurf/arm-unknown-riscos/cross/bin in
 preference to /home/riscos/cross/bin

svn path=/trunk/netsurf/; revision=11189
---
 Makefile | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'Makefile')

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
-- 
cgit v1.2.3