Skip to content
Snippets Groups Projects
Commit 10873f95 authored by Eric Müller's avatar Eric Müller :mountain_bicyclist:
Browse files

Fix hxtorch (workaround lib-vendoring issue of pthreadpool)

parent 1afda157
No related branches found
No related tags found
No related merge requests found
......@@ -89,14 +89,16 @@ class Hxtorch(WafPackage):
print("libs: manually adding ", self.spec['llvm'].prefix.lib)
library.append(self.spec['llvm'].prefix.lib)
# explicitly add googletest library if it isn't found above
# explicitly add googletest library if it isn't found above;
# adding in front of the list of libraries is a hack to circumvent
# issues from vendoring packages like pthreadpool
if not any('googletest' in lib for lib in library):
if os.path.isdir(self.spec['googletest'].prefix.lib64):
print("libs: manually adding ", self.spec['googletest'].prefix.lib64)
library.append(self.spec['googletest'].prefix.lib64)
print("libs: manually inserting at front ", self.spec['googletest'].prefix.lib64)
library.insert(0, self.spec['googletest'].prefix.lib64)
if os.path.isdir(self.spec['googletest'].prefix.lib):
print("libs: manually adding ", self.spec['googletest'].prefix.lib)
library.append(self.spec['googletest'].prefix.lib)
print("libs: manually inserting at front ", self.spec['googletest'].prefix.lib)
library.insert(0, self.spec['googletest'].prefix.lib)
env.set('CPATH', ':'.join(include))
env.set('C_INCLUDE_PATH', ':'.join(include))
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment