summaryrefslogtreecommitdiff
path: root/components/finsh/SConscript
diff options
context:
space:
mode:
authoryangjie11 <[email protected]>2020-11-18 09:56:35 +0800
committerGitHub <[email protected]>2020-11-18 09:56:35 +0800
commitd4a682e8d97fa131e5a8d795f8c5451d55cdd5b0 (patch)
tree4773b40cb012475c5daf74bfd55707e141477669 /components/finsh/SConscript
parent2b98f4720c827ae1850df78299f6b273d568c8c7 (diff)
parent2ef3c9d861f55253620996a94831a4be31ca6620 (diff)
Merge pull request #3 from RT-Thread/master
sync
Diffstat (limited to 'components/finsh/SConscript')
-rw-r--r--components/finsh/SConscript23
1 files changed, 8 insertions, 15 deletions
diff --git a/components/finsh/SConscript b/components/finsh/SConscript
index 639cbebd4a..be04c56616 100644
--- a/components/finsh/SConscript
+++ b/components/finsh/SConscript
@@ -4,7 +4,6 @@ from building import *
cwd = GetCurrentDir()
src = Split('''
shell.c
-symbol.c
cmd.c
''')
@@ -21,26 +20,20 @@ finsh_vm.c
finsh_token.c
''')
-msh_src = Split('''
-msh.c
-msh_cmd.c
-msh_file.c
-''')
-
-CPPPATH = [cwd]
-if rtconfig.CROSS_TOOL == 'keil':
- LINKFLAGS = ' --keep *.o(FSymTab)'
+msh_src = Glob('msh.c')
- if not GetDepend('FINSH_USING_MSH_ONLY'):
- LINKFLAGS = LINKFLAGS + ' --keep *.o(VSymTab) '
-else:
- LINKFLAGS = ''
+if GetDepend('RT_USING_DFS'):
+ msh_src += ['msh_file.c']
+if not GetDepend('FINSH_USING_SYMTAB'):
+ src += ['symbol.c']
if GetDepend('FINSH_USING_MSH'):
src = src + msh_src
if not GetDepend('FINSH_USING_MSH_ONLY'):
src = src + fsh_src
-group = DefineGroup('finsh', src, depend = ['RT_USING_FINSH'], CPPPATH = CPPPATH, LINKFLAGS = LINKFLAGS)
+CPPPATH = [cwd]
+
+group = DefineGroup('finsh', src, depend = ['RT_USING_FINSH'], CPPPATH = CPPPATH)
Return('group')