summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJohn-Mark Bell <jmb@netsurf-browser.org>2022-06-02 23:36:44 +0100
committerJohn-Mark Bell <jmb@netsurf-browser.org>2022-06-02 23:36:44 +0100
commit4043bcdd57ab21b1308f68db524fdaeb7c5abcd7 (patch)
tree300b020e7d44ee1f6b59a789009acbdfa0e47aed /Makefile
parent294770f746d4bf95d04d8dce39ed05a03b2b0b29 (diff)
downloadlibrufl-4043bcdd57ab21b1308f68db524fdaeb7c5abcd7.tar.gz
librufl-4043bcdd57ab21b1308f68db524fdaeb7c5abcd7.tar.bz2
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.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 7bc8c9d..0af5e97 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ TESTRUNNER := $(PERL) $(NSTESTTOOLS)/testrunner.pl
WARNFLAGS := -Wall -W -Wundef -Wpointer-arith -Wcast-align \
-Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \
-Wmissing-declarations -Wnested-externs
-ifeq ($(HOST),arm-unknown-riscos)
+ifeq ($(findstring -riscos,$(HOST)),-riscos)
WARNFLAGS := $(WARNFLAGS) -pedantic
endif
# BeOS/Haiku/AmigaOS4 standard library headers create warnings
@@ -35,7 +35,7 @@ CFLAGS := $(CFLAGS) -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=500
# OSLib
ifneq ($(findstring clean,$(MAKECMDGOALS)),clean)
- ifeq ($(HOST),arm-unknown-riscos)
+ ifeq ($(findstring -riscos,$(HOST)),-riscos)
CFLAGS := $(CFLAGS) -I$(PREFIX)/include
LDFLAGS := $(LDFLAGS) -lOSLib32
TESTLDFLAGS := $(TESTLDFLAGS) -static