From 3bf721a6fbb15405f9738a27740977b6ac175f62 Mon Sep 17 00:00:00 2001 From: Bernard Xiong Date: Sat, 1 Nov 2014 09:18:21 +0800 Subject: [PATCH] [BSP] Update C++ compiling options --- bsp/lpc176x/SConstruct | 1 + bsp/lpc176x/rtconfig.py | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/bsp/lpc176x/SConstruct b/bsp/lpc176x/SConstruct index 4afcf9660..681e6469c 100644 --- a/bsp/lpc176x/SConstruct +++ b/bsp/lpc176x/SConstruct @@ -14,6 +14,7 @@ TARGET = 'rtthread-lpc17xx.' + rtconfig.TARGET_EXT env = Environment(tools = ['mingw'], AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS, CC = rtconfig.CC, CCFLAGS = rtconfig.CFLAGS, + CXX = rtconfig.CXX, CXXFLAGS = rtconfig.CXXFLAGS, AR = rtconfig.AR, ARFLAGS = '-rc', LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS) diff --git a/bsp/lpc176x/rtconfig.py b/bsp/lpc176x/rtconfig.py index 17607f215..b999555a0 100644 --- a/bsp/lpc176x/rtconfig.py +++ b/bsp/lpc176x/rtconfig.py @@ -26,7 +26,8 @@ BUILD = 'debug' if PLATFORM == 'gcc': # toolchains PREFIX = 'arm-none-eabi-' - CC = PREFIX + 'gcc' + CC = PREFIX + 'gcc' + CXX = PREFIX + 'g++' AS = PREFIX + 'gcc' AR = PREFIX + 'ar' LINK = PREFIX + 'gcc' @@ -37,6 +38,7 @@ if PLATFORM == 'gcc': DEVICE = ' -mcpu=cortex-m3 -mthumb' CFLAGS = DEVICE + CXXFLAGS = CFLAGS AFLAGS = ' -c' + DEVICE + ' -x assembler-with-cpp' LFLAGS = DEVICE + ' -Wl,--gc-sections,-Map=rtthread-lpc17xx.map,-cref,-u,Reset_Handler -T rtthread-lpc17xx.ld' @@ -54,6 +56,7 @@ if PLATFORM == 'gcc': elif PLATFORM == 'armcc': # toolchains CC = 'armcc' + CXX = 'armcc' AS = 'armasm' AR = 'armar' LINK = 'armlink' @@ -65,6 +68,7 @@ elif PLATFORM == 'armcc': LFLAGS = DEVICE + ' --info sizes --info totals --info unused --info veneers --list rtthread-lpc17xx.map --scatter rtthread-lpc17xx.sct' CFLAGS += ' -I' + EXEC_PATH + '/ARM/RV31/INC' + CXXFLAGS = CFLAGS LFLAGS += ' --libpath ' + EXEC_PATH + '/ARM/RV31/LIB' EXEC_PATH += '/arm/bin40/' -- GitLab