summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Tytgat <joty@netsurf-browser.org>2008-09-28 20:35:57 +0000
committerJohn Tytgat <joty@netsurf-browser.org>2008-09-28 20:35:57 +0000
commit58837fe7fb2196d39f09425329087b6b48aace46 (patch)
tree5f765f2aa95784fd7b3cc8e4d1bd3d8ab95a8cef
parentbf18dfdc711847965a3f62c7b65cd081efa84ba0 (diff)
downloadlibhubbub-58837fe7fb2196d39f09425329087b6b48aace46.tar.gz
libhubbub-58837fe7fb2196d39f09425329087b6b48aace46.tar.bz2
GCCSDK 4 build compatibility (not finished yet)
svn path=/trunk/hubbub/; revision=5458
-rw-r--r--Makefile2
-rw-r--r--Makefile-riscos16
2 files changed, 11 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 24ea7dc..74af8d6 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ TOUCH := touch
WARNFLAGS := -Wall -Wextra -Wundef -Wpointer-arith -Wcast-align \
-Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \
-Wmissing-declarations -Wnested-externs -Werror -pedantic
-CFLAGS += -std=c99 -D_BSD_SOURCE -I$(TOP)/include/ $(WARNFLAGS)
+CFLAGS = -std=c99 -D_BSD_SOURCE -I$(TOP)/include/ $(WARNFLAGS)
RELEASECFLAGS = $(CFLAGS) -DNDEBUG -O2
DEBUGCFLAGS = $(CFLAGS) -O0 -g
ARFLAGS := -cru
diff --git a/Makefile-riscos b/Makefile-riscos
index 34b213e..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
@@ -16,15 +16,15 @@ PERL := perl
PKGCONFIG := $(GCCSDK_INSTALL_ENV)/ro-pkg-config
INSTALL := install
SED := sed
+TOUCH := touch
LCOV := echo
GENHTML := echo
-TOUCH := touch
# Toolchain flags
WARNFLAGS := -Wall -Wextra -Wundef -Wpointer-arith -Wcast-align \
-Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \
-Wmissing-declarations -Wnested-externs -Werror -pedantic
-CFLAGS += -std=c99 -D_BSD_SOURCE -I$(TOP)/include/ $(WARNFLAGS) \
+CFLAGS = -std=c99 -D_BSD_SOURCE -I$(TOP)/include/ $(WARNFLAGS) \
-mpoke-function-name
RELEASECFLAGS = $(CFLAGS) -DNDEBUG -O2
DEBUGCFLAGS = $(CFLAGS) -O0 -g
@@ -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)