summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn-Mark Bell <jmb@netsurf-browser.org>2022-06-03 01:06:45 +0100
committerJohn-Mark Bell <jmb@netsurf-browser.org>2022-06-03 01:06:45 +0100
commit3fe86945effb26bc695ce60bb766bb1524df41d9 (patch)
tree55d75c3d77dd95192faf23e3c4e9c5a284d69e71
parentabdbd16aed11a024d88920b3ad42b62db7e90ddd (diff)
downloadmakerun-3fe86945effb26bc695ce60bb766bb1524df41d9.tar.gz
makerun-3fe86945effb26bc695ce60bb766bb1524df41d9.tar.bz2
Update buildsystem for new RISC OS tooling
If cross-compiling for RISC OS, ensure we correctly detect the new toolchain.
-rw-r--r--Makefile9
1 files changed, 7 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index b69eadf..a0a07c4 100644
--- a/Makefile
+++ b/Makefile
@@ -44,8 +44,13 @@ ifeq ($(TARGET),riscos)
EXEEXT := ,e1f
SUBTARGET := -elf-
else
- EXEEXT := ,ff8
- SUBTARGET := -aof-
+ ifneq (,$(findstring arm-riscos-gnueabihf-gcc,$(CC)))
+ EXEEXT := ,e1f
+ SUBTARGET := -elfeabi-
+ else
+ EXEEXT := ,ff8
+ SUBTARGET := -aof-
+ endif
endif
endif