summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile-riscos12
1 files changed, 8 insertions, 4 deletions
diff --git a/Makefile-riscos b/Makefile-riscos
index 12a431b..d7c938b 100644
--- a/Makefile-riscos
+++ b/Makefile-riscos
@@ -2,9 +2,9 @@
GCCSDK_INSTALL_CROSSBIN ?= /home/riscos/cross/bin
GCCSDK_INSTALL_ENV ?= /home/riscos/env
-CC := $(GCCSDK_INSTALL_CROSSBIN)/gcc
-AR := $(GCCSDK_INSTALL_CROSSBIN)/ar
-LD := $(GCCSDK_INSTALL_CROSSBIN)/gcc
+CC := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc)
+AR := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*ar)
+LD := $(CC)
CP := cp
RM := rm
@@ -40,7 +40,11 @@ MAKEFLAGS :=
PKGCONFIGFLAGS :=
TOUCHFLAGS :=
-EXEEXT := ,ff8
+ifneq (,$(findstring arm-unknown-riscos-gcc,$(CC)))
+ EXEEXT := ,e1f
+else
+ EXEEXT := ,ff8
+endif
# Default installation prefix
PREFIX ?= $(GCCSDK_INSTALL_ENV)