diff options
| author | [email protected] <[email protected]> | 2012-11-05 06:58:25 +0000 |
|---|---|---|
| committer | [email protected] <[email protected]> | 2012-11-05 06:58:25 +0000 |
| commit | 42e003ac4d912663f22471616a4557a4349b47ac (patch) | |
| tree | 3ca53ba30671de486289c34bd288652fbebafa1f /tools | |
| parent | 0eb29ecc3bc3f12788436ff7549c22f88bb992fc (diff) | |
Fix LIBS and LIBPATH merge in building script.
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@2393 bbd45198-f89e-11dd-88c7-29a3b14d5316
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/building.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/tools/building.py b/tools/building.py index fd89c53e8f..0307bf74fd 100644 --- a/tools/building.py +++ b/tools/building.py @@ -192,11 +192,16 @@ def MergeGroup(src_group, group): src_group['LINKFLAGS'] = src_group['LINKFLAGS'] + group['LINKFLAGS'] else: src_group['LINKFLAGS'] = group['LINKFLAGS'] - if group.has_key('LIBRARY'): - if src_group['LIBRARY'].has_key('LIBRARY'): - src_group['LIBRARY'] = src_group['LIBRARY'] + group['LIBRARY'] + if group.has_key('LIBS'): + if src_group.has_key('LIBS'): + src_group['LIBS'] = src_group['LIBS'] + group['LIBS'] + else: + src_group['LIBS'] = group['LIBS'] + if group.has_key('LIBPATH'): + if src_group.has_key('LIBPATH'): + src_group['LIBPATH'] = src_group['LIBPATH'] + group['LIBPATH'] else: - src_group['LIBRARY'] = group['LIBRARY'] + src_group['LIBPATH'] = group['LIBPATH'] def DefineGroup(name, src, depend, **parameters): global Env |