[DEV] add based on element

This commit is contained in:
Edouard DUPIN 2016-08-22 21:52:31 +02:00 committed by Edouard DUPIN
parent 43c7947b95
commit 97db63bcfd
3 changed files with 8 additions and 6 deletions

View File

@ -449,6 +449,7 @@ class Module:
self.sub_heritage_list = heritage.HeritageList()
# optionnal dependency :
for dep, option, export in self.depends_optionnal:
debug.verbose("try find optionnal dependency: '" + str(dep) + "'")
inherit_list, isBuilt = target.build(dep, package_name, True)
if isBuilt == True:
self.local_heritage.add_depends(dep);

View File

@ -158,14 +158,14 @@ def exist(lib_name, target_name, target) :
debug.verbose("add to path: '" + os.path.dirname(data["path"]) + "'")
sys.path.append(os.path.dirname(data["path"]))
debug.verbose("import system : '" + data["name"] + "'")
theSystem = __import__(env.get_build_system_base_name() + __start_system_name + target_name + "_" + data["name"])
the_system = __import__(env.get_build_system_base_name() + __start_system_name + target_name + "_" + data["name"])
#create the system module
try:
debug.verbose("SYSTEM: request: " + data["name"])
data["system"] = theSystem.System(target)
debug.verbose("SYSTEM: request: " + str(data["name"]))
if "System" in dir(the_system):
data["system"] = the_system.System(target)
data["exist"] = data["system"].valid
except Exception as e:
debug.warning("Not find: '" + data["name"] + "' ==> get exception:" + str(e))
else:
debug.warning("Not find: '" + data["name"] + "' ==> get exception")
return data["exist"]
return False

View File

@ -127,6 +127,7 @@ def link(file, binary, target, depancy, flags, name, basic_path, static = False)
cmd.append("-Wl,-R$ORIGIN/../lib/")
except:
pass
cmd.append("-Wl,-rpath,\"\$ORIGIN/../lib\"")
try:
cmd.append(flags["local"]["link"])
except: