summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlberto Invernizzi <9337627+albestro@users.noreply.github.com>2023-08-10 14:34:33 +0200
committerGitHub <noreply@github.com>2023-08-10 08:34:33 -0400
commit7968cb7fa23f0365c00401baeed90a0dfdb4a35e (patch)
tree042d42cd0fec2f9d39955adce8a34796b064b243
parentebc2efdfd23cbb1713a0698b50f6d9de7f465b2d (diff)
downloadspack-7968cb7fa23f0365c00401baeed90a0dfdb4a35e.tar.gz
spack-7968cb7fa23f0365c00401baeed90a0dfdb4a35e.tar.bz2
spack-7968cb7fa23f0365c00401baeed90a0dfdb4a35e.tar.xz
spack-7968cb7fa23f0365c00401baeed90a0dfdb4a35e.zip
mpich: fix macos problem with -flat-namespace (#35611)
Co-authored-by: Harmen Stoppels <harmenstoppels@gmail.com>
-rw-r--r--var/spack/repos/builtin/packages/mpich/package.py16
1 files changed, 4 insertions, 12 deletions
diff --git a/var/spack/repos/builtin/packages/mpich/package.py b/var/spack/repos/builtin/packages/mpich/package.py
index 0a4c1d2ea1..cf3e27fc22 100644
--- a/var/spack/repos/builtin/packages/mpich/package.py
+++ b/var/spack/repos/builtin/packages/mpich/package.py
@@ -98,15 +98,6 @@ spack package at this time.""",
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(
"vci",
default=False,
when="@4: device=ch4",
@@ -496,6 +487,10 @@ with '-Wl,-commons,use_dylibs' and without
"--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
if spec.satisfies("@4.0:"):
config_args.append(
@@ -578,9 +573,6 @@ with '-Wl,-commons,use_dylibs' and without
config_args.append("--with-thread-package=argobots")
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:
config_args.append("--enable-thread-cs=per-vci")
config_args.append("--with-ch4-max-vcis=default")