diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2010-12-30 21:04:02 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2010-12-30 21:04:02 +0000 |
| commit | 90ca16be00f57e1d8e5cf1815b8fbe56285fd7e9 (patch) | |
| tree | 567d3a8fa281ed078821cc4ee29467712d0948f3 /makefiles/Makefile.tools | |
| parent | 3adf32759fc9c99d24a6168e249fdf8c166c648d (diff) | |
| download | buildsystem-90ca16be00f57e1d8e5cf1815b8fbe56285fd7e9.tar.gz buildsystem-90ca16be00f57e1d8e5cf1815b8fbe56285fd7e9.tar.bz2 | |
Default GCCSDK_INSTALL_* to /opt/netsurf/arm-unknown-riscos/... if present.
Fall back to /home/riscos/... if not.
svn path=/trunk/tools/buildsystem/; revision=11175
Diffstat (limited to 'makefiles/Makefile.tools')
| -rw-r--r-- | makefiles/Makefile.tools | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/makefiles/Makefile.tools b/makefiles/Makefile.tools index 7603ba5..ccdbb80 100644 --- a/makefiles/Makefile.tools +++ b/makefiles/Makefile.tools @@ -100,8 +100,21 @@ ifeq ($(TARGET),riscos) CURDIR := <$(COMPONENT)$$Dir> else # Cross compiling for RISC OS - 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 AR__ := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*ar) CC__ := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc) |