diff options
| author | John-Mark Bell <jmb@netsurf-browser.org> | 2022-11-03 20:40:39 +0000 |
|---|---|---|
| committer | John-Mark Bell <jmb@netsurf-browser.org> | 2022-11-03 20:40:39 +0000 |
| commit | b4ba781fe22f356d7c53b1674dff91323af61458 (patch) | |
| tree | b26f932a51adcce72a1d9763a849265ebf4f97bd | |
| parent | ec5d4ab33e4bb09397ed7610842ae8a420f884fa (diff) | |
| download | buildsystem-b4ba781fe22f356d7c53b1674dff91323af61458.tar.gz buildsystem-b4ba781fe22f356d7c53b1674dff91323af61458.tar.bz2 | |
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.
| -rw-r--r-- | makefiles/Makefile.tools | 7 |
1 files 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 |