Skip to content
Snippets Groups Projects
Commit 88788778 authored by Eleni Mathioulaki's avatar Eleni Mathioulaki
Browse files

fix(llvm): custom add_files_to_view() no longer needed

parent 234e6d82
No related branches found
No related tags found
2 merge requests!495update to Spack v0.21.1,!493fix(llvm): add_files_to_view() got unexpected argument
Pipeline #27709 failed with stage
in 12 hours, 14 minutes, and 21 seconds
......@@ -392,9 +392,6 @@ class Llvm(CMakePackage, CudaPackage):
variant('visionary', default=False,
description="Include patches necessary for visionary python "
"bindings generator")
variant('force_full_view', default=False,
description='Force linking of all files into view, including '
'known conflicts (e.g. libgomp).')
conflicts("@:8", when="+visionary")
conflicts("@13:", when="+visionary")
......@@ -1018,26 +1015,6 @@ class Llvm(CMakePackage, CudaPackage):
with working_dir(self.build_directory):
install_tree("bin", join_path(self.prefix, "libexec", "llvm"))
# begin VISIONS (added)
def add_files_to_view(self, view, merge_map):
python = self.spec["python"]
# we remove libgomp-related files from views as they conflict with
# gcc- or python-ones
ignore_file_paths = [
join_path(self.prefix, "lib", "libgomp.so"),
join_path(self.prefix, "lib",
f"python{'.'.join(str(python.version).split('.')[:2])}",
"site-packages", "README.txt"),
]
if self.spec.satisfies('~force_full_view'):
for path in ignore_file_paths:
if path in merge_map:
del merge_map[path]
super(Llvm, self).add_files_to_view(view, merge_map)
# end VISIONS
def llvm_config(self, *args, **kwargs):
lc = Executable(self.prefix.bin.join("llvm-config"))
if not kwargs.get("output"):
......
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