diff options
| author | John-Mark Bell <jmb@netsurf-browser.org> | 2021-08-02 20:13:21 +0100 |
|---|---|---|
| committer | John-Mark Bell <jmb@netsurf-browser.org> | 2021-08-02 20:13:21 +0100 |
| commit | 29ca302e4f395a18568e65d03dbc60914590be6b (patch) | |
| tree | ee0fb8fa32a7f6812d2f0e91317aeeb545386f7e | |
| parent | 5bb88a810c485b382b501098122806bda13dc7c0 (diff) | |
| download | ttf2f-29ca302e4f395a18568e65d03dbc60914590be6b.tar.gz ttf2f-29ca302e4f395a18568e65d03dbc60914590be6b.tar.bz2 | |
Fix RISC OS build
5bb88a81 got BUILD and HOST confused, so we were not linking the
RISC OS binary statically.
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | src/Makefile | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -22,7 +22,7 @@ CFLAGS := $(CFLAGS) -std=c99 -D_BSD_SOURCE -D_POSIX_C_SOURCE \ # Freetype2 ifneq ($(findstring clean,$(MAKECMDGOALS)),clean) ifneq ($(PKGCONFIG),) - ifeq ($(BUILD),arm-unknown-riscos) + ifeq ($(HOST),arm-unknown-riscos) CFLAGS := $(CFLAGS) $(shell $(PKGCONFIG) freetype2 --cflags --static) LDFLAGS := $(LDFLAGS) $(shell $(PKGCONFIG) freetype2 --libs --static) else @@ -37,7 +37,7 @@ endif # OSLib (RISC OS target only) ifneq ($(findstring clean,$(MAKECMDGOALS)),clean) - ifeq ($(BUILD),arm-unknown-riscos) + ifeq ($(HOST),arm-unknown-riscos) CFLAGS := $(CFLAGS) -I$(PREFIX)/include -static LDFLAGS := $(LDFLAGS) -lOSLib32 -lOSLibSupport32 -static endif diff --git a/src/Makefile b/src/Makefile index a9e9e5e..0265d3f 100644 --- a/src/Makefile +++ b/src/Makefile @@ -4,7 +4,7 @@ DIR_SOURCES := encoding.c ft.c glyphs.c intmetrics.c outlines.c utils.c ifeq ($(FRONTEND),cli) DIR_SOURCES := $(DIR_SOURCES) cli.c else - ifeq ($(BUILD),arm-unknown-riscos) + ifeq ($(HOST),arm-unknown-riscos) DIR_SOURCES := $(DIR_SOURCES) toolbox.c endif endif |