From 42e003ac4d912663f22471616a4557a4349b47ac Mon Sep 17 00:00:00 2001 From: "bernard.xiong@gmail.com" Date: Mon, 5 Nov 2012 06:58:25 +0000 Subject: [PATCH] Fix LIBS and LIBPATH merge in building script. git-svn-id: https://rt-thread.googlecode.com/svn/trunk@2393 bbd45198-f89e-11dd-88c7-29a3b14d5316 --- tools/building.py | 13 +++++++++---- 1 file 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['LIBRARY'] = group['LIBRARY'] + 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['LIBPATH'] = group['LIBPATH'] def DefineGroup(name, src, depend, **parameters): global Env