summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn-Mark Bell <jmb@netsurf-browser.org>2014-11-16 10:53:10 (GMT)
committer John-Mark Bell <jmb@netsurf-browser.org>2014-11-16 10:53:10 (GMT)
commit1b3318a0b35dc6f19e0e77b4d611734c25d8740a (patch)
tree82f89e546462d90005c51ae1fc4c9a281a0222af
parentbbc902100e3c45a88b3bad9ee924e3f41d5181cc (diff)
downloadiconv-master.tar.gz
iconv-master.tar.bz2
Fix up for new buildsystemHEADmaster
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index b646af1..31841ac 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ include $(NSSHARED)/makefiles/Makefile.tools
TESTRUNNER := $(PERL) $(NSTESTTOOLS)/testrunner.pl
-ifneq ($(HOST),riscos)
+ifneq ($(HOST),arm-unknown-riscos)
export UNICODE_DIR := $(CURDIR)/riscos/!Boot/Resources/!Unicode/
endif
@@ -22,7 +22,7 @@ WARNFLAGS := -Wall -Wextra -Wundef -Wpointer-arith -Wcast-align \
CFLAGS := -std=c99 -D_BSD_SOURCE -I$(CURDIR)/include/ \
-I$(CURDIR)/src $(WARNFLAGS) $(CFLAGS)
-ifeq ($(TARGET),riscos)
+ifeq ($(BUILD),arm-unknown-riscos)
LDFLAGS := $(LDFLAGS) -L$(CURDIR)/unicode/libro -lunicode
else
LDFLAGS := $(LDFLAGS) -L$(CURDIR)/unicode/lib -lunicode