diff --git a/components/lwp/SConscript b/components/lwp/SConscript index 6eb8763fde..c53b3f483c 100644 --- a/components/lwp/SConscript +++ b/components/lwp/SConscript @@ -52,7 +52,7 @@ CPPPATH += ['./terminal/'] if not GetDepend(['LWP_USING_RUNTIME']): SrcRemove(src, 'lwp_runtime.c') -group = DefineGroup('lwP', src, depend = ['RT_USING_SMART'], CPPPATH = CPPPATH) +group = DefineGroup('lwProcess', src, depend = ['RT_USING_SMART'], CPPPATH = CPPPATH) group = group + SConscript(os.path.join('vdso', 'SConscript')) Return('group') diff --git a/components/lwp/arch/risc-v/rv64/SConscript b/components/lwp/arch/risc-v/rv64/SConscript deleted file mode 100644 index c815b3db5d..0000000000 --- a/components/lwp/arch/risc-v/rv64/SConscript +++ /dev/null @@ -1,11 +0,0 @@ -# RT-Thread building script for component - -from building import * - -cwd = GetCurrentDir() -src = Glob('*.c') + Glob('*.S') -CPPPATH = [cwd] - -group = DefineGroup('lwp-riscv', src, depend = ['RT_USING_SMART'], CPPPATH = CPPPATH) - -Return('group') diff --git a/components/lwp/arch/x86/i386/SConscript b/components/lwp/arch/x86/i386/SConscript deleted file mode 100644 index 4088ce09f3..0000000000 --- a/components/lwp/arch/x86/i386/SConscript +++ /dev/null @@ -1,11 +0,0 @@ -# RT-Thread building script for component - -from building import * - -cwd = GetCurrentDir() -src = Glob('*.c') + Glob('*.S') -CPPPATH = [cwd] - -group = DefineGroup('lwp-x86-i386', src, depend = ['RT_USING_SMART'], CPPPATH = CPPPATH) - -Return('group') diff --git a/components/lwp/vdso/SConscript b/components/lwp/vdso/SConscript index 4360e8bf23..5f3f853d71 100644 --- a/components/lwp/vdso/SConscript +++ b/components/lwp/vdso/SConscript @@ -35,12 +35,15 @@ else: process_env['RTT_DEVICE'] = rtconfig.DEVICE command = ["scons", "-C", vdso_arch] - clean_command = ["scons", "-C", vdso_arch, "--clean"] + if GetOption('clean'): + command = ["scons", "-C", vdso_arch, "--clean"] - if not GetOption('clean'): + try: result = subprocess.run(command, env=process_env, check=True) - else: - result = subprocess.run(clean_command, env=process_env, check=True) + # generic error handle + except : + print('exec command: "%s" failed.' % ' '.join(command)) + exit(1) if result.returncode == 0: print("Command executed successfully") @@ -48,5 +51,5 @@ else: print("Command failed with exit code:", result.returncode) exit(1) -group = DefineGroup('vDSO', src, depend = ['RT_USING_SMART','RT_USING_VDSO'], CPPPATH = CPPPATH) +group = DefineGroup('lwProcess', src, depend = ['RT_USING_SMART','RT_USING_VDSO'], CPPPATH = CPPPATH) Return('group')