summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorVincent Sanders <vince@netsurf-browser.org>2012-12-10 11:38:52 +0000
committerVincent Sanders <vince@netsurf-browser.org>2012-12-10 11:38:52 +0000
commit8698245ad2e7885368f71080154b6590b407e7b5 (patch)
tree148c67ed69346f1c21271a8492c2c421029eeccb /Makefile
parenta1876073adc2d13cf0c493c21a485302f6333c77 (diff)
downloadnetsurf-8698245ad2e7885368f71080154b6590b407e7b5.tar.gz
netsurf-8698245ad2e7885368f71080154b6590b407e7b5.tar.bz2
use g++ to link on riscos
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 3 insertions, 1 deletions
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