diff options
| author | John-Mark Bell <jmb@netsurf-browser.org> | 2022-06-02 23:38:55 +0100 |
|---|---|---|
| committer | John-Mark Bell <jmb@netsurf-browser.org> | 2022-06-02 23:38:55 +0100 |
| commit | ec5d4ab33e4bb09397ed7610842ae8a420f884fa (patch) | |
| tree | a115ee67e00dcd3194b0dec6f72f8f7e126f7fb6 | |
| parent | 1fbac2b96208708bb6447a01f793248bc72e9ada (diff) | |
| download | buildsystem-ec5d4ab33e4bb09397ed7610842ae8a420f884fa.tar.gz | |
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.
| -rw-r--r-- | makefiles/Makefile.tools | 15 |
1 files 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 |