Forráskód Böngészése

[BSP] Update C++ compiling options

Bernard Xiong 10 éve
szülő
commit
3bf721a6fb
2 módosított fájl, 6 hozzáadás és 1 törlés
  1. 1 0
      bsp/lpc176x/SConstruct
  2. 5 1
      bsp/lpc176x/rtconfig.py

+ 1 - 0
bsp/lpc176x/SConstruct

@@ -14,6 +14,7 @@ TARGET = 'rtthread-lpc17xx.' + rtconfig.TARGET_EXT
 env = Environment(tools = ['mingw'],
 env = Environment(tools = ['mingw'],
 	AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS,
 	AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS,
 	CC = rtconfig.CC, CCFLAGS = rtconfig.CFLAGS,
 	CC = rtconfig.CC, CCFLAGS = rtconfig.CFLAGS,
+	CXX = rtconfig.CXX, CXXFLAGS = rtconfig.CXXFLAGS,
 	AR = rtconfig.AR, ARFLAGS = '-rc',
 	AR = rtconfig.AR, ARFLAGS = '-rc',
 	LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS)
 	LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS)
 
 

+ 5 - 1
bsp/lpc176x/rtconfig.py

@@ -26,7 +26,8 @@ BUILD = 'debug'
 if PLATFORM == 'gcc':
 if PLATFORM == 'gcc':
     # toolchains
     # toolchains
     PREFIX = 'arm-none-eabi-'
     PREFIX = 'arm-none-eabi-'
-    CC = PREFIX + 'gcc'
+    CC  = PREFIX + 'gcc'
+    CXX = PREFIX + 'g++'
     AS = PREFIX + 'gcc'
     AS = PREFIX + 'gcc'
     AR = PREFIX + 'ar'
     AR = PREFIX + 'ar'
     LINK = PREFIX + 'gcc'
     LINK = PREFIX + 'gcc'
@@ -37,6 +38,7 @@ if PLATFORM == 'gcc':
 
 
     DEVICE = ' -mcpu=cortex-m3 -mthumb'
     DEVICE = ' -mcpu=cortex-m3 -mthumb'
     CFLAGS = DEVICE
     CFLAGS = DEVICE
+    CXXFLAGS = CFLAGS
     AFLAGS = ' -c' + DEVICE + ' -x assembler-with-cpp'
     AFLAGS = ' -c' + DEVICE + ' -x assembler-with-cpp'
     LFLAGS = DEVICE + ' -Wl,--gc-sections,-Map=rtthread-lpc17xx.map,-cref,-u,Reset_Handler -T rtthread-lpc17xx.ld'
     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':
 elif PLATFORM == 'armcc':
     # toolchains
     # toolchains
     CC = 'armcc'
     CC = 'armcc'
+    CXX = 'armcc'
     AS = 'armasm'
     AS = 'armasm'
     AR = 'armar'
     AR = 'armar'
     LINK = 'armlink'
     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'
     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'
     CFLAGS += ' -I' + EXEC_PATH + '/ARM/RV31/INC'
+    CXXFLAGS = CFLAGS
     LFLAGS += ' --libpath ' + EXEC_PATH + '/ARM/RV31/LIB'
     LFLAGS += ' --libpath ' + EXEC_PATH + '/ARM/RV31/LIB'
 
 
     EXEC_PATH += '/arm/bin40/'
     EXEC_PATH += '/arm/bin40/'