From c00a200c508e18c41b6c55506ee35a2f21a6fa57 Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Fri, 12 Jan 2018 09:53:54 +0100
Subject: add optional aspectc++ support

---
 src/arch/arduino-nano/Makefile.inc   | 4 ++++
 src/arch/esp8266/Makefile.inc        | 4 ++++
 src/arch/msp430fr5969lp/Makefile.inc | 4 ++++
 src/arch/posix/Makefile.inc          | 4 ++++
 4 files changed, 16 insertions(+)

(limited to 'src')

diff --git a/src/arch/arduino-nano/Makefile.inc b/src/arch/arduino-nano/Makefile.inc
index cd6227b..f4dd78e 100644
--- a/src/arch/arduino-nano/Makefile.inc
+++ b/src/arch/arduino-nano/Makefile.inc
@@ -14,6 +14,10 @@ NM = avr-nm
 OBJCOPY = avr-objcopy
 OBJDUMP = avr-objdump
 
+ifeq (${aspectc}, 1)
+	CXX = ag++ -r build/repo.acp -v 0 --c_compiler avr-g++ -p . --Xcompiler
+endif
+
 TARGETS += src/arch/arduino-nano/arch.cc
 TARGETS += src/arch/arduino-nano/driver/gpio.cc
 TARGETS += src/arch/arduino-nano/driver/stdout.cc
diff --git a/src/arch/esp8266/Makefile.inc b/src/arch/esp8266/Makefile.inc
index 6fdcf4b..69a96f1 100644
--- a/src/arch/esp8266/Makefile.inc
+++ b/src/arch/esp8266/Makefile.inc
@@ -11,6 +11,10 @@ AR = ${TOOLCHAIN_BASE}/xtensa-lx106-elf-ar
 LD = ${TOOLCHAIN_BASE}/xtensa-lx106-elf-gcc
 OBJCOPY = ${TOOLCHAIN_BASE}/xtensa-lx106-elf-objcopy
 
+ifeq (${aspectc}, 1)
+	CXX = ag++ -r build/repo.acp -v 0 --c_compiler ${TOOLCHAIN_BASE}/xtensa-lx106-elf-g++ -p . --Xcompiler
+endif
+
 INCLUDES += -Iinclude/esp8266 -I${SDK_BASE}/include
 COMMON_FLAGS += -nostdlib -mlongcalls -D__ets__ -DICACHE_FLASH
 CXXFLAGS = -std=c++11
diff --git a/src/arch/msp430fr5969lp/Makefile.inc b/src/arch/msp430fr5969lp/Makefile.inc
index 1581c2d..05fcab1 100644
--- a/src/arch/msp430fr5969lp/Makefile.inc
+++ b/src/arch/msp430fr5969lp/Makefile.inc
@@ -12,6 +12,10 @@ OBJCOPY = /opt/msp430/ti/gcc/bin/msp430-elf-objcopy
 
 TARGETS += src/arch/msp430fr5969lp/arch.cc
 
+ifeq (${aspectc}, 1)
+	CXX = ag++ -r build/repo.acp -v 0 --c_compiler /opt/msp430/ti/gcc/bin/msp430-elf-g++ -p . --Xcompiler
+endif
+
 ifneq ($(findstring adc,${arch_drivers}), )
 	TARGETS += src/arch/msp430fr5969lp/driver/adc.cc
 endif
diff --git a/src/arch/posix/Makefile.inc b/src/arch/posix/Makefile.inc
index 37c8e0e..a706314 100644
--- a/src/arch/posix/Makefile.inc
+++ b/src/arch/posix/Makefile.inc
@@ -3,6 +3,10 @@
 CC = gcc
 CXX = g++
 
+ifeq (${aspectc}, 1)
+	CXX = ag++ -r build/repo.acp -v 0 -p . --Xcompiler
+endif
+
 INCLUDES += -Iinclude/posix
 TARGETS += src/arch/posix/arch.cc src/arch/posix/driver/gpio.cc
 TARGETS += src/arch/posix/driver/stdout.cc src/arch/posix/driver/uptime.cc
-- 
cgit v1.2.3