From 7968cb7fa23f0365c00401baeed90a0dfdb4a35e Mon Sep 17 00:00:00 2001 From: Alberto Invernizzi <9337627+albestro@users.noreply.github.com> Date: Thu, 10 Aug 2023 14:34:33 +0200 Subject: mpich: fix macos problem with -flat-namespace (#35611) Co-authored-by: Harmen Stoppels --- var/spack/repos/builtin/packages/mpich/package.py | 16 ++++------------ 1 file 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 @@ -97,15 +97,6 @@ spack package at this time.""", variant("argobots", default=False, description="Enable Argobots 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( "vci", default=False, @@ -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") -- cgit v1.2.3-60-g2f50