Gitweb links:
...log
http://git.netsurf-browser.org/buildsystem.git/shortlog/b4ba781fe22f356d7c53b1674dff91323af61458
...commit
http://git.netsurf-browser.org/buildsystem.git/commit/b4ba781fe22f356d7c53b1674dff91323af61458
...tree
http://git.netsurf-browser.org/buildsystem.git/tree/b4ba781fe22f356d7c53b1674dff91323af61458
The branch, master has been updated
via b4ba781fe22f356d7c53b1674dff91323af61458 (commit)
from ec5d4ab33e4bb09397ed7610842ae8a420f884fa (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=b4ba781fe22f356d7c53b1674dff91323af61458
commit b4ba781fe22f356d7c53b1674dff91323af61458
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>
RISC OS: support gnueabi as well as gnueabihf
The former is soft-float ABI and Risc PC compatible ARMv4.
The latter is hard-float ABI and ARMv7.
diff --git a/makefiles/Makefile.tools b/makefiles/Makefile.tools
index 31fd9f4..112e7f8 100644
--- a/makefiles/Makefile.tools
+++ b/makefiles/Makefile.tools
@@ -160,8 +160,8 @@ else
ifeq ($(findstring -riscos,$(HOST)),-riscos)
# Cross compiling for RISC OS
- ifeq ($(HOST),arm-riscos-gnueabihf)
- # Can't build modules with this toolchain
+ ifeq ($(findstring gnueabi,$(HOST)),gnueabi)
+ # Can't build modules with this [arm-riscos-gnueabi(hf)] toolchain
CMHG ?= echo
else
CMHG ?= PATH="$(GCCSDK_INSTALL_CROSSBIN):$(PATH)"
$(GCCSDK_INSTALL_CROSSBIN)/cmunge
@@ -175,6 +175,9 @@ else
ifneq ($(findstring arm-unknown-riscos-gcc,$(CC__)),)
EXEEXT := ,e1f
endif
+ ifneq ($(findstring arm-riscos-gnueabi-gcc,$(CC__)),)
+ EXEEXT := ,e1f
+ endif
ifneq ($(findstring arm-riscos-gnueabihf-gcc,$(CC__)),)
EXEEXT := ,e1f
endif
-----------------------------------------------------------------------
Summary of changes:
makefiles/Makefile.tools | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/makefiles/Makefile.tools b/makefiles/Makefile.tools
index 31fd9f4..112e7f8 100644
--- a/makefiles/Makefile.tools
+++ b/makefiles/Makefile.tools
@@ -160,8 +160,8 @@ else
ifeq ($(findstring -riscos,$(HOST)),-riscos)
# Cross compiling for RISC OS
- ifeq ($(HOST),arm-riscos-gnueabihf)
- # Can't build modules with this toolchain
+ ifeq ($(findstring gnueabi,$(HOST)),gnueabi)
+ # Can't build modules with this [arm-riscos-gnueabi(hf)] toolchain
CMHG ?= echo
else
CMHG ?= PATH="$(GCCSDK_INSTALL_CROSSBIN):$(PATH)"
$(GCCSDK_INSTALL_CROSSBIN)/cmunge
@@ -175,6 +175,9 @@ else
ifneq ($(findstring arm-unknown-riscos-gcc,$(CC__)),)
EXEEXT := ,e1f
endif
+ ifneq ($(findstring arm-riscos-gnueabi-gcc,$(CC__)),)
+ EXEEXT := ,e1f
+ endif
ifneq ($(findstring arm-riscos-gnueabihf-gcc,$(CC__)),)
EXEEXT := ,e1f
endif
--
NetSurf Project build system
_______________________________________________
netsurf-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
