diff options
| author | Bernard Xiong <[email protected]> | 2019-03-13 08:58:27 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-03-13 08:58:27 +0800 |
| commit | aad4e1f343f74992d949b6cfdb825740569be27e (patch) | |
| tree | bfb7298b5307e7db3f820db43533eaee77e7e481 | |
| parent | 298ddc60ee13429ae1c323911e50a463036cd829 (diff) | |
| parent | 3e4a93cc91692454d9fba54c2494b5de4a4172c4 (diff) | |
Merge pull request #2429 from armink/del_keep
Delete the unused '--keep' link flag when used RT_USED marco.
| -rw-r--r-- | components/finsh/SConscript | 9 | ||||
| -rw-r--r-- | src/SConscript | 11 |
2 files changed, 2 insertions, 18 deletions
diff --git a/components/finsh/SConscript b/components/finsh/SConscript index 639cbebd4a..e1e2b3bbdb 100644 --- a/components/finsh/SConscript +++ b/components/finsh/SConscript @@ -28,19 +28,12 @@ msh_file.c ''') CPPPATH = [cwd] -if rtconfig.CROSS_TOOL == 'keil': - LINKFLAGS = ' --keep *.o(FSymTab)' - - if not GetDepend('FINSH_USING_MSH_ONLY'): - LINKFLAGS = LINKFLAGS + ' --keep *.o(VSymTab) ' -else: - LINKFLAGS = '' 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) +group = DefineGroup('finsh', src, depend = ['RT_USING_FINSH'], CPPPATH = CPPPATH) Return('group') diff --git a/src/SConscript b/src/SConscript index bb38baa6bd..7f448725a2 100644 --- a/src/SConscript +++ b/src/SConscript @@ -5,15 +5,6 @@ from building import * src = Glob('*.c') CPPPATH = [RTT_ROOT + '/include'] -if rtconfig.CROSS_TOOL == 'keil': - # add more link flags for module and components_init. - LINKFLAGS = '' - if GetDepend('RT_USING_MODULE'): - LINKFLAGS += ' --keep *.o(RTMSymTab) ' - if GetDepend('RT_USING_COMPONENTS_INIT'): - LINKFLAGS += ' --keep *.o(.rti_fn.*) ' -else: - LINKFLAGS = '' if GetDepend('RT_USING_COMPONENTS_INIT') == False: SrcRemove(src, ['components.c']) @@ -38,6 +29,6 @@ if GetDepend('RT_USING_MEMHEAP') == False: if GetDepend('RT_USING_DEVICE') == False: SrcRemove(src, ['device.c']) -group = DefineGroup('Kernel', src, depend = [''], CPPPATH = CPPPATH, LINKFLAGS = LINKFLAGS) +group = DefineGroup('Kernel', src, depend = [''], CPPPATH = CPPPATH) Return('group') |