diff options
author | Vincent Sanders <vince@netsurf-browser.org> | 2012-12-10 11:38:52 +0000 |
---|---|---|
committer | Vincent Sanders <vince@netsurf-browser.org> | 2012-12-10 11:38:52 +0000 |
commit | 8698245ad2e7885368f71080154b6590b407e7b5 (patch) | |
tree | 148c67ed69346f1c21271a8492c2c421029eeccb | |
parent | a1876073adc2d13cf0c493c21a485302f6333c77 (diff) | |
download | netsurf-8698245ad2e7885368f71080154b6590b407e7b5.tar.gz netsurf-8698245ad2e7885368f71080154b6590b407e7b5.tar.bz2 |
use g++ to link on riscos
-rw-r--r-- | Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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 |