From 76416f1964c214fba408f3cdf15cf4935fec0252 Mon Sep 17 00:00:00 2001
From: John Tytgat <joty@netsurf-browser.org>
Date: Fri, 28 Dec 2007 15:43:57 +0000
Subject: GCCSDK 4 build support.

svn path=/trunk/netsurf/; revision=3674
---
 makefile | 6 +++---
 posix.mk | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/makefile b/makefile
index aacf1e3b4..cd1224480 100644
--- a/makefile
+++ b/makefile
@@ -73,11 +73,11 @@ OBJECTS_GTK += font_pango.o gtk_bitmap.o gtk_gui.o \
 	gtk_download.o						# gtk/
 
 
-OBJDIR_RISCOS = arm-riscos-aof
+OBJDIR_RISCOS = $(shell $(CC) -dumpmachine)
 SOURCES_RISCOS=$(OBJECTS_RISCOS:.o=.c)
 OBJS_RISCOS=$(OBJECTS_RISCOS:%.o=$(OBJDIR_RISCOS)/%.o)
 
-OBJDIR_RISCOS_SMALL = arm-riscos-aof-small
+OBJDIR_RISCOS_SMALL = $(shell $(CC) -dumpmachine)-small
 SOURCES_RISCOS_SMALL=$(OBJECTS_RISCOS_SMALL:.o=.c)
 OBJS_RISCOS_SMALL=$(OBJECTS_RISCOS_SMALL:%.o=$(OBJDIR_RISCOS_SMALL)/%.o)
 
@@ -140,7 +140,7 @@ CFLAGS_GTK += -U__STRICT_ANSI__
 endif
 endif
 
-AFLAGS_RISCOS = -I..,. $(PLATFORM_AFLAGS_RISCOS)
+AFLAGS_RISCOS = -xassembler-with-cpp $(PLATFORM_AFLAGS_RISCOS)
 AFLAGS_RISCOS_SMALL = $(AFLAGS_RISCOS) -Dsmall
 
 # targets
diff --git a/posix.mk b/posix.mk
index b2c5175fa..ef452144f 100644
--- a/posix.mk
+++ b/posix.mk
@@ -1,9 +1,10 @@
 GCCSDK_INSTALL_CROSSBIN ?= /home/riscos/cross/bin
 GCCSDK_INSTALL_ENV ?= /home/riscos/env
 
-CC = $(GCCSDK_INSTALL_CROSSBIN)/gcc
 CC_DEBUG = /usr/bin/gcc
-ASM = $(GCCSDK_INSTALL_CROSSBIN)/gcc
+# The wildcard rule matches on 'gcc' (GCCSDK 3.4) or 'arm-unknown-riscos-gcc' (GCCSDK 4)
+CC = $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc)
+ASM = $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc)
 
 PLATFORM_CFLAGS_RISCOS = -I$(GCCSDK_INSTALL_ENV)/include \
 		-I$(GCCSDK_INSTALL_ENV)/include/libxml2 \
-- 
cgit v1.2.3