mpich: fix macos problem with -flat-namespace (#35611)
Co-authored-by: Harmen Stoppels <harmenstoppels@gmail.com>
This commit is contained in:
parent
ebc2efdfd2
commit
7968cb7fa2
@ -97,15 +97,6 @@ class Mpich(AutotoolsPackage, CudaPackage, ROCmPackage):
|
|||||||
variant("argobots", default=False, description="Enable Argobots support")
|
variant("argobots", default=False, description="Enable Argobots support")
|
||||||
variant("fortran", default=True, description="Enable Fortran support")
|
variant("fortran", default=True, description="Enable Fortran support")
|
||||||
|
|
||||||
variant(
|
|
||||||
"two_level_namespace",
|
|
||||||
default=False,
|
|
||||||
description="""Build shared libraries and programs
|
|
||||||
built with the mpicc/mpifort/etc. compiler wrappers
|
|
||||||
with '-Wl,-commons,use_dylibs' and without
|
|
||||||
'-Wl,-flat_namespace'.""",
|
|
||||||
)
|
|
||||||
|
|
||||||
variant(
|
variant(
|
||||||
"vci",
|
"vci",
|
||||||
default=False,
|
default=False,
|
||||||
@ -496,6 +487,10 @@ def configure_args(self):
|
|||||||
"--with-yaksa={0}".format(spec["yaksa"].prefix if "^yaksa" in spec else "embedded"),
|
"--with-yaksa={0}".format(spec["yaksa"].prefix if "^yaksa" in spec else "embedded"),
|
||||||
]
|
]
|
||||||
|
|
||||||
|
# see https://github.com/pmodels/mpich/issues/5530
|
||||||
|
if spec.platform == "darwin":
|
||||||
|
config_args.append("--enable-two-level-namespace")
|
||||||
|
|
||||||
# hwloc configure option changed in 4.0
|
# hwloc configure option changed in 4.0
|
||||||
if spec.satisfies("@4.0:"):
|
if spec.satisfies("@4.0:"):
|
||||||
config_args.append(
|
config_args.append(
|
||||||
@ -578,9 +573,6 @@ def configure_args(self):
|
|||||||
config_args.append("--with-thread-package=argobots")
|
config_args.append("--with-thread-package=argobots")
|
||||||
config_args.append("--with-argobots=" + spec["argobots"].prefix)
|
config_args.append("--with-argobots=" + spec["argobots"].prefix)
|
||||||
|
|
||||||
if "+two_level_namespace" in spec:
|
|
||||||
config_args.append("--enable-two-level-namespace")
|
|
||||||
|
|
||||||
if "+vci" in spec:
|
if "+vci" in spec:
|
||||||
config_args.append("--enable-thread-cs=per-vci")
|
config_args.append("--enable-thread-cs=per-vci")
|
||||||
config_args.append("--with-ch4-max-vcis=default")
|
config_args.append("--with-ch4-max-vcis=default")
|
||||||
|
Loading…
Reference in New Issue
Block a user