From c4df1d6a19c2ab9c67b42150adb81f49757b6f8c Mon Sep 17 00:00:00 2001 From: yangjie11 Date: Mon, 12 Jun 2023 14:32:48 +0800 Subject: [cpp] support rt-thread CPP wrapper sub-switch macros --- components/libc/cplusplus/SConscript | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'components/libc/cplusplus/SConscript') diff --git a/components/libc/cplusplus/SConscript b/components/libc/cplusplus/SConscript index 760049c139..a7829cea6d 100644 --- a/components/libc/cplusplus/SConscript +++ b/components/libc/cplusplus/SConscript @@ -1,21 +1,17 @@ -# RT-Thread building script for component - from building import * +import os Import('rtconfig') -cwd = GetCurrentDir() -src = Glob('*.cpp') + Glob('*.c') +cwd = GetCurrentDir() +src = ['cxx_crt_init.c', 'cxx_crt.cpp'] CPPPATH = [cwd] -if GetDepend('RT_USING_CPLUSPLUS11'): - src += Glob('cpp11/*.cpp') + Glob('cpp11/*.c') - if rtconfig.PLATFORM in ['armclang']: - src += Glob('cpp11/armclang/*.cpp') + Glob('cpp11/armclang/*.c') - CPPPATH += [cwd + '/cpp11/armclang'] - elif rtconfig.PLATFORM in ['gcc']: - src += Glob('cpp11/gcc/*.cpp') + Glob('cpp11/gcc/*.c') - CPPPATH += [cwd + '/cpp11/gcc'] +group = DefineGroup('CPP', src, depend=['RT_USING_CPLUSPLUS'], CPPPATH=CPPPATH) -group = DefineGroup('CPlusPlus', src, depend = ['RT_USING_CPLUSPLUS'], CPPPATH = CPPPATH) +list = os.listdir(cwd) +for d in list: + path = os.path.join(cwd, d) + if os.path.isfile(os.path.join(path, 'SConscript')): + group = group + SConscript(os.path.join(d, 'SConscript')) Return('group') -- cgit v1.3.1