diff options
| author | shaolin <[email protected]> | 2014-03-04 09:14:48 +0800 |
|---|---|---|
| committer | shaolin <[email protected]> | 2014-03-04 09:14:48 +0800 |
| commit | 020e95d91b5e1d7f902674a320e42657bee3ebfe (patch) | |
| tree | 65b65bfa527e0e8670dc807a8fee8d507d67ca48 /tools/building.py | |
| parent | 0fb9c54efda7fef4346523fdc4b92512a0441ee1 (diff) | |
| parent | 738871fd9ebbd53da6cfcc429dfdd5ffc17fd685 (diff) | |
Merge branch 'master' of https://github.com/RT-Thread/rt-thread
Diffstat (limited to 'tools/building.py')
| -rw-r--r-- | tools/building.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/tools/building.py b/tools/building.py index 00ef97c4b0..6427e7c0dd 100644 --- a/tools/building.py +++ b/tools/building.py @@ -284,11 +284,6 @@ def MergeGroup(src_group, group): else: src_group['LIBPATH'] = group['LIBPATH'] - if src_group.has_key('LIBS'): - print src_group['LIBS'] - if src_group.has_key('LIBS'): - print src_group['LIBPATH'] - def DefineGroup(name, src, depend, **parameters): global Env if not GetDepend(depend): @@ -327,9 +322,11 @@ def DefineGroup(name, src, depend, **parameters): # check whether exist group library if not GetOption('buildlib') and os.path.exists(os.path.join(group['path'], GroupLibFullName(name, Env))): - Env.Append(LIBS = [GroupLibName(name, Env)]) group['src'] = [] - Env.Append(LIBPATH = [GetCurrentDir()]) + if group.has_key('LIBS'): group['LIBS'] = group['LIBS'] + [GroupLibName(name, Env)] + else : group['LIBS'] = [GroupLibName(name, Env)] + if group.has_key('LIBPATH'): group['LIBPATH'] = group['LIBPATH'] + [GetCurrentDir()] + else : group['LIBPATH'] = [GetCurrentDir()] if group.has_key('LIBS'): Env.Append(LIBS = group['LIBS']) |