From ec5d4ab33e4bb09397ed7610842ae8a420f884fa Mon Sep 17 00:00:00 2001
From: John-Mark Bell <jmb@netsurf-browser.org>
Date: Thu, 2 Jun 2022 23:38:55 +0100
Subject: 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.
---
 makefiles/Makefile.tools | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'makefiles/Makefile.tools')

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
-- 
cgit v1.2.3