diff options
author | John-Mark Bell <jmb@netsurf-browser.org> | 2022-06-02 23:36:44 +0100 |
---|---|---|
committer | John-Mark Bell <jmb@netsurf-browser.org> | 2022-06-02 23:36:44 +0100 |
commit | 4043bcdd57ab21b1308f68db524fdaeb7c5abcd7 (patch) | |
tree | 300b020e7d44ee1f6b59a789009acbdfa0e47aed | |
parent | 294770f746d4bf95d04d8dce39ed05a03b2b0b29 (diff) | |
download | librufl-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.
-rw-r--r-- | Makefile | 4 | ||||
-rw-r--r-- | test/Makefile | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -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 diff --git a/test/Makefile b/test/Makefile index 451ea46..65c3170 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,5 +1,5 @@ # Tests -ifeq ($(HOST),arm-unknown-riscos) +ifeq ($(findstring -riscos,$(HOST)),-riscos) DIR_TEST_ITEMS := $(DIR_TEST_ITEMS) \ rufl_test:rufl_test.c \ rufl_chars:rufl_chars.c |