From 8698245ad2e7885368f71080154b6590b407e7b5 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@netsurf-browser.org>
Date: Mon, 10 Dec 2012 11:38:52 +0000
Subject: use g++ to link on riscos

---
 Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 428aa74b4..7b823acd0 100644
--- a/Makefile
+++ b/Makefile
@@ -153,6 +153,7 @@ ifeq ($(TARGET),riscos)
     SQUEEZE := squeeze
     RUNEXT :=
     CC := gcc
+    CXX := g++
     EXEEXT :=
     PKG_CONFIG :=
   else
@@ -188,6 +189,7 @@ ifeq ($(TARGET),riscos)
      SUBTARGET := -aof
      EXEEXT := ,ff8
     endif
+    CXX := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*g++)
     PKG_CONFIG := $(GCCSDK_INSTALL_ENV)/ro-pkg-config
   endif
 else
@@ -432,7 +434,7 @@ $(EXETARGET): $(OBJECTS) $(RESOURCES)
 ifneq ($(TARGET)$(SUBTARGET),riscos-elf)
 	$(Q)$(CC) -o $(EXETARGET) $(OBJECTS) $(LDFLAGS)
 else
-	$(Q)$(CC) -o $(EXETARGET:,ff8=,e1f) $(OBJECTS) $(LDFLAGS)
+	$(Q)$(CXX) -o $(EXETARGET:,ff8=,e1f) $(OBJECTS) $(LDFLAGS)
 	$(Q)$(ELF2AIF) $(EXETARGET:,ff8=,e1f) $(EXETARGET)
 	$(Q)$(RM) $(EXETARGET:,ff8=,e1f)
 endif
-- 
cgit v1.2.3