summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbernard <[email protected]>2014-02-23 00:08:38 +0800
committerbernard <[email protected]>2014-02-23 00:08:38 +0800
commit5ce39b8ad833d129616ac888fc27208e62e39cc1 (patch)
treee4d593643bf0c2f93063e041040513a1cc6e6356
parent0468f0c87ed05cb6966bda66e2a9b8a3b3bfd698 (diff)
[scons] Add the library to the group when used buildlib building
-rw-r--r--tools/building.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/building.py b/tools/building.py
index 00ef97c4b0..372d93f06f 100644
--- a/tools/building.py
+++ b/tools/building.py
@@ -327,9 +327,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'])