Gitweb links:
...log
http://git.netsurf-browser.org/buildsystem.git/shortlog/ec5d4ab33e4bb09397ed7610842ae8a420f884fa
...commit
http://git.netsurf-browser.org/buildsystem.git/commit/ec5d4ab33e4bb09397ed7610842ae8a420f884fa
...tree
http://git.netsurf-browser.org/buildsystem.git/tree/ec5d4ab33e4bb09397ed7610842ae8a420f884fa
The branch, master has been updated
via ec5d4ab33e4bb09397ed7610842ae8a420f884fa (commit)
from 1fbac2b96208708bb6447a01f793248bc72e9ada (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/buildsystem.git/commit/?id=ec5d4ab33e4bb09397ed7610842ae8a420f884fa
commit ec5d4ab33e4bb09397ed7610842ae8a420f884fa
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>
Tweak RISC OS host detection for new tooling.
The new toolchain has a different machine triplet, so update the
things that care about it to work either way.
diff --git a/makefiles/Makefile.tools b/makefiles/Makefile.tools
index f312394..31fd9f4 100644
--- a/makefiles/Makefile.tools
+++ b/makefiles/Makefile.tools
@@ -158,18 +158,25 @@ else
GCCSDK_INSTALL_ENV := $(realpath $(toolpath_)../../env)
endif
- ifeq ($(HOST),arm-unknown-riscos)
+ ifeq ($(findstring -riscos,$(HOST)),-riscos)
# Cross compiling for RISC OS
- CMHG ?= PATH="$(GCCSDK_INSTALL_CROSSBIN):$(PATH)"
$(GCCSDK_INSTALL_CROSSBIN)/cmunge
+ ifeq ($(HOST),arm-riscos-gnueabihf)
+ # Can't build modules with this toolchain
+ CMHG ?= echo
+ else
+ CMHG ?= PATH="$(GCCSDK_INSTALL_CROSSBIN):$(PATH)"
$(GCCSDK_INSTALL_CROSSBIN)/cmunge
+ endif
GENHTML ?= echo
LCOV ?= echo
PKGCONFIG ?=
PKG_CONFIG_LIBDIR="$(PREFIX)/lib/pkgconfig:$(GCCSDK_INSTALL_ENV)/lib/pkgconfig:$(GCCSDK_INSTALL_ENV)/share/pkgconfig"
pkg-config
ifneq ($(COMPONENT_TYPE),riscos-module)
+ EXEEXT := ,ff8
ifneq ($(findstring arm-unknown-riscos-gcc,$(CC__)),)
EXEEXT := ,e1f
- else
- EXEEXT := ,ff8
+ endif
+ ifneq ($(findstring arm-riscos-gnueabihf-gcc,$(CC__)),)
+ EXEEXT := ,e1f
endif
else
EXEEXT := ,ffa
-----------------------------------------------------------------------
Summary of changes:
makefiles/Makefile.tools | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/makefiles/Makefile.tools b/makefiles/Makefile.tools
index f312394..31fd9f4 100644
--- a/makefiles/Makefile.tools
+++ b/makefiles/Makefile.tools
@@ -158,18 +158,25 @@ else
GCCSDK_INSTALL_ENV := $(realpath $(toolpath_)../../env)
endif
- ifeq ($(HOST),arm-unknown-riscos)
+ ifeq ($(findstring -riscos,$(HOST)),-riscos)
# Cross compiling for RISC OS
- CMHG ?= PATH="$(GCCSDK_INSTALL_CROSSBIN):$(PATH)"
$(GCCSDK_INSTALL_CROSSBIN)/cmunge
+ ifeq ($(HOST),arm-riscos-gnueabihf)
+ # Can't build modules with this toolchain
+ CMHG ?= echo
+ else
+ CMHG ?= PATH="$(GCCSDK_INSTALL_CROSSBIN):$(PATH)"
$(GCCSDK_INSTALL_CROSSBIN)/cmunge
+ endif
GENHTML ?= echo
LCOV ?= echo
PKGCONFIG ?=
PKG_CONFIG_LIBDIR="$(PREFIX)/lib/pkgconfig:$(GCCSDK_INSTALL_ENV)/lib/pkgconfig:$(GCCSDK_INSTALL_ENV)/share/pkgconfig"
pkg-config
ifneq ($(COMPONENT_TYPE),riscos-module)
+ EXEEXT := ,ff8
ifneq ($(findstring arm-unknown-riscos-gcc,$(CC__)),)
EXEEXT := ,e1f
- else
- EXEEXT := ,ff8
+ endif
+ ifneq ($(findstring arm-riscos-gnueabihf-gcc,$(CC__)),)
+ EXEEXT := ,e1f
endif
else
EXEEXT := ,ffa
--
NetSurf Project build system
_______________________________________________
netsurf-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
