Merge pull request #1636 from aozima/scons_dev
[scons] remove check whether exist group library.
This commit is contained in:
commit
c385b7922b
|
@ -585,14 +585,6 @@ def DefineGroup(name, src, depend, **parameters):
|
||||||
if os.path.exists(fn):
|
if os.path.exists(fn):
|
||||||
os.unlink(fn)
|
os.unlink(fn)
|
||||||
|
|
||||||
# check whether exist group library
|
|
||||||
if not GetOption('buildlib') and os.path.exists(os.path.join(group['path'], GroupLibFullName(name, Env))):
|
|
||||||
group['src'] = []
|
|
||||||
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'):
|
if group.has_key('LIBS'):
|
||||||
Env.AppendUnique(LIBS = group['LIBS'])
|
Env.AppendUnique(LIBS = group['LIBS'])
|
||||||
if group.has_key('LIBPATH'):
|
if group.has_key('LIBPATH'):
|
||||||
|
|
Loading…
Reference in New Issue