summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSajid Ali <sajidsyed2021@u.northwestern.edu>2022-04-15 10:44:22 -0500
committerGitHub <noreply@github.com>2022-04-15 17:44:22 +0200
commitcf21fd837f3cee1aef2a5b5e6057eba0194d867f (patch)
tree5df0bb8df2823822d601a16fc15d84b91f7a671b
parent01609b31118a9c9d4d6e8211de53ceb84a14a56d (diff)
downloadspack-cf21fd837f3cee1aef2a5b5e6057eba0194d867f.tar.gz
spack-cf21fd837f3cee1aef2a5b5e6057eba0194d867f.tar.bz2
spack-cf21fd837f3cee1aef2a5b5e6057eba0194d867f.tar.xz
spack-cf21fd837f3cee1aef2a5b5e6057eba0194d867f.zip
llvm@14: Fix build: Add hwloc include directory for libompd (#29757)
-rw-r--r--var/spack/repos/builtin/packages/llvm/llvm14-hwloc-ompd.patch13
-rw-r--r--var/spack/repos/builtin/packages/llvm/package.py3
2 files changed, 16 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/llvm/llvm14-hwloc-ompd.patch b/var/spack/repos/builtin/packages/llvm/llvm14-hwloc-ompd.patch
new file mode 100644
index 0000000000..bdae92e09c
--- /dev/null
+++ b/var/spack/repos/builtin/packages/llvm/llvm14-hwloc-ompd.patch
@@ -0,0 +1,13 @@
+--- a/openmp/libompd/src/CMakeLists.txt
++++ b/openmp/libompd/src/CMakeLists.txt
+@@ -44,6 +44,10 @@
+ ${LIBOMP_SRC_DIR}
+ )
+
++if(${LIBOMP_USE_HWLOC})
++ include_directories(${LIBOMP_HWLOC_INSTALL_DIR}/include)
++endif()
++
+ INSTALL( TARGETS ompd
+ LIBRARY DESTINATION ${OPENMP_INSTALL_LIBDIR}
+ ARCHIVE DESTINATION ${OPENMP_INSTALL_LIBDIR}
diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py
index 268af5ce0e..418a391736 100644
--- a/var/spack/repos/builtin/packages/llvm/package.py
+++ b/var/spack/repos/builtin/packages/llvm/package.py
@@ -358,6 +358,9 @@ class Llvm(CMakePackage, CudaPackage):
# avoid build failed with Fujitsu compiler
patch('llvm13-fujitsu.patch', when='@13 %fj')
+ # patch for missing hwloc.h include for libompd
+ patch('llvm14-hwloc-ompd.patch', when='@14')
+
# The functions and attributes below implement external package
# detection for LLVM. See:
#