From e614941c672621995207349bd5cfcc74fe0c950f Mon Sep 17 00:00:00 2001
From: Eleni Mathioulaki <emathioulaki@athenarc.gr>
Date: Wed, 16 Nov 2022 14:21:45 +0100
Subject: [PATCH] Update packages/llvm/package.py

---
 packages/llvm/package.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/llvm/package.py b/packages/llvm/package.py
index 4d0226b7..1fefbac6 100644
--- a/packages/llvm/package.py
+++ b/packages/llvm/package.py
@@ -771,7 +771,7 @@ class Llvm(CMakePackage, CudaPackage):
         return ret
 
     # ECM: might be not needed anymore?
-    def add_files_to_view(self, view, merge_map):
+    def add_files_to_view(self, view, merge_map, skip_if_exists=True):
         # we remove libgomp-related files from views as they conflict with
         # gcc-ones
         ignore_file_paths = [
@@ -783,7 +783,7 @@ class Llvm(CMakePackage, CudaPackage):
                 if path in merge_map:
                     del merge_map[path]
 
-        super(Llvm, self).add_files_to_view(view, merge_map)
+        super(Llvm, self).add_files_to_view(view, merge_mapv, skip_if_exists=True)
 
 def get_llvm_targets_to_build(spec):
     targets = spec.variants['targets'].value
-- 
GitLab