mpich@4.0.2 %oneapi: patch config.rpath (#31740)
This commit is contained in:
parent
1319e2d261
commit
3b692875d8
2 changed files with 33 additions and 0 deletions
|
@ -0,0 +1,30 @@
|
||||||
|
diff -ruN spack-src/confdb/config.rpath spack-src-patched/confdb/config.rpath
|
||||||
|
--- spack-src/confdb/config.rpath 2022-03-29 15:13:49.000000000 -0700
|
||||||
|
+++ spack-src-patched/confdb/config.rpath 2022-07-25 17:54:14.638367460 -0700
|
||||||
|
@@ -76,7 +76,7 @@
|
||||||
|
ecc*)
|
||||||
|
wl='-Wl,'
|
||||||
|
;;
|
||||||
|
- icc* | ifort*)
|
||||||
|
+ icc* | icx* | ifort* | ifx*)
|
||||||
|
wl='-Wl,'
|
||||||
|
;;
|
||||||
|
lf95*)
|
||||||
|
@@ -233,7 +233,7 @@
|
||||||
|
enable_dtags_flag="${wl}--enable-new-dtags"
|
||||||
|
disable_dtags_flag="${wl}--disable-new-dtags"
|
||||||
|
else
|
||||||
|
- case $cc_basename in ifort*)
|
||||||
|
+ case $cc_basename in ifort* | ifx*)
|
||||||
|
enable_dtags_flag="${wl}--enable-new-dtags"
|
||||||
|
disable_dtags_flag="${wl}--disable-new-dtags"
|
||||||
|
;;
|
||||||
|
@@ -380,7 +380,7 @@
|
||||||
|
;;
|
||||||
|
darwin* | rhapsody*)
|
||||||
|
hardcode_direct=no
|
||||||
|
- if { case $cc_basename in ifort*) true;; *) test "$GCC" = yes;; esac; }; then
|
||||||
|
+ if { case $cc_basename in ifort* | ifx*) true;; *) test "$GCC" = yes;; esac; }; then
|
||||||
|
:
|
||||||
|
else
|
||||||
|
ld_shlibs=no
|
|
@ -140,6 +140,9 @@ class Mpich(AutotoolsPackage, CudaPackage, ROCmPackage):
|
||||||
'mpicc', 'mpicxx', 'mpif77', 'mpif90', 'mpifort', relative_root='bin'
|
'mpicc', 'mpicxx', 'mpif77', 'mpif90', 'mpifort', relative_root='bin'
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# https://github.com/spack/spack/issues/31678
|
||||||
|
patch('mpich-oneapi-config-rpath.patch', when='@4.0.2 %oneapi')
|
||||||
|
|
||||||
# Fix using an external hwloc
|
# Fix using an external hwloc
|
||||||
# See https://github.com/pmodels/mpich/issues/4038
|
# See https://github.com/pmodels/mpich/issues/4038
|
||||||
# and https://github.com/pmodels/mpich/pull/3540
|
# and https://github.com/pmodels/mpich/pull/3540
|
||||||
|
|
Loading…
Reference in a new issue