Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/0e8f33ecf1c6cd7bf517c9880be86b0326bf575a
...commit
http://git.netsurf-browser.org/netsurf.git/commit/0e8f33ecf1c6cd7bf517c9880be86b0326bf575a
...tree
http://git.netsurf-browser.org/netsurf.git/tree/0e8f33ecf1c6cd7bf517c9880be86b0326bf575a
The branch, master has been updated
via 0e8f33ecf1c6cd7bf517c9880be86b0326bf575a (commit)
from 91ce4ddedf61f95a30a4ae07e2ebbcec4321db60 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=0e8f33ecf1c6cd7bf517c9880be86b0326bf575a
commit 0e8f33ecf1c6cd7bf517c9880be86b0326bf575a
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>
atari: auto-detect toolchain
diff --git a/frontends/atari/Makefile.tools b/frontends/atari/Makefile.tools
index 971ab21be..da11e1c09 100644
--- a/frontends/atari/Makefile.tools
+++ b/frontends/atari/Makefile.tools
@@ -9,11 +9,28 @@ else
ifeq ($(HOST),mint)
PKG_CONFIG := pkg-config
else
- GCCSDK_INSTALL_ENV ?= /opt/netsurf/m68k-atari-mint/env
- GCCSDK_INSTALL_CROSSBIN ?= /opt/netsurf/m68k-atari-mint/cross/bin
+ # Cross-build
+
+ # Search for the toolchain install locations if we haven't been told
+ # The search order prefers m68k over m5475
+ ifeq ($(origin GCCSDK_INSTALL_ENV),undefined)
+ ifneq ($(realpath /opt/netsurf/m68k-atari-mint/env),)
+ GCCSDK_INSTALL_ENV := /opt/netsurf/m68k-atari-mint/env
+ else
+ GCCSDK_INSTALL_ENV := /opt/netsurf/m5475-atari-mint/env
+ endif
+ endif
+
+ ifeq ($(origin GCCSDK_INSTALL_CROSSBIN),undefined)
+ ifneq ($(realpath /opt/netsurf/m68k-atari-mint/env),)
+ GCCSDK_INSTALL_CROSSBIN := /opt/netsurf/m68k-atari-mint/cross/bin
+ else
+ GCCSDK_INSTALL_CROSSBIN := /opt/netsurf/m5475-atari-mint/cross/bin
+ endif
+ endif
CC := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc)
PKG_CONFIG := PKG_CONFIG_LIBDIR="$(GCCSDK_INSTALL_ENV)/lib/pkgconfig"
pkg-config
endif
-endif
\ No newline at end of file
+endif
-----------------------------------------------------------------------
Summary of changes:
frontends/atari/Makefile.tools | 23 ++++++++++++++++++++---
1 file changed, 20 insertions(+), 3 deletions(-)
diff --git a/frontends/atari/Makefile.tools b/frontends/atari/Makefile.tools
index 971ab21be..da11e1c09 100644
--- a/frontends/atari/Makefile.tools
+++ b/frontends/atari/Makefile.tools
@@ -9,11 +9,28 @@ else
ifeq ($(HOST),mint)
PKG_CONFIG := pkg-config
else
- GCCSDK_INSTALL_ENV ?= /opt/netsurf/m68k-atari-mint/env
- GCCSDK_INSTALL_CROSSBIN ?= /opt/netsurf/m68k-atari-mint/cross/bin
+ # Cross-build
+
+ # Search for the toolchain install locations if we haven't been told
+ # The search order prefers m68k over m5475
+ ifeq ($(origin GCCSDK_INSTALL_ENV),undefined)
+ ifneq ($(realpath /opt/netsurf/m68k-atari-mint/env),)
+ GCCSDK_INSTALL_ENV := /opt/netsurf/m68k-atari-mint/env
+ else
+ GCCSDK_INSTALL_ENV := /opt/netsurf/m5475-atari-mint/env
+ endif
+ endif
+
+ ifeq ($(origin GCCSDK_INSTALL_CROSSBIN),undefined)
+ ifneq ($(realpath /opt/netsurf/m68k-atari-mint/env),)
+ GCCSDK_INSTALL_CROSSBIN := /opt/netsurf/m68k-atari-mint/cross/bin
+ else
+ GCCSDK_INSTALL_CROSSBIN := /opt/netsurf/m5475-atari-mint/cross/bin
+ endif
+ endif
CC := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc)
PKG_CONFIG := PKG_CONFIG_LIBDIR="$(GCCSDK_INSTALL_ENV)/lib/pkgconfig"
pkg-config
endif
-endif
\ No newline at end of file
+endif
--
NetSurf Browser
