diff options
| -rw-r--r-- | lib/spack/spack/platforms/cray.py | 3 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/pkg-config/package.py | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/lib/spack/spack/platforms/cray.py b/lib/spack/spack/platforms/cray.py index 095a426b22..e6e9685f74 100644 --- a/lib/spack/spack/platforms/cray.py +++ b/lib/spack/spack/platforms/cray.py @@ -108,6 +108,9 @@ class Cray(Platform): if os.path.isdir(cray_wrapper_names): env.prepend_path('PATH', cray_wrapper_names) env.prepend_path('SPACK_ENV_PATH', cray_wrapper_names) + # Makes spack installed pkg-config work on Crays + env.append_path("PKG_CONFIG_PATH", "/usr/lib64/pkgconfig") + env.append_path("PKG_CONFIG_PATH", "/usr/local/lib64/pkgconfig") @classmethod def detect(cls): diff --git a/var/spack/repos/builtin/packages/pkg-config/package.py b/var/spack/repos/builtin/packages/pkg-config/package.py index 44e03c7401..0d9fceec6e 100644 --- a/var/spack/repos/builtin/packages/pkg-config/package.py +++ b/var/spack/repos/builtin/packages/pkg-config/package.py @@ -53,11 +53,6 @@ class PkgConfig(AutotoolsPackage): Adds the ACLOCAL path for autotools.""" spack_env.append_path('ACLOCAL_PATH', join_path(self.prefix.share, 'aclocal')) - if 'platform=cray' in self.spec: - spack_env.append_path('PKG_CONFIG_PATH', - '/usr/lib64/pkgconfig') - spack_env.append_path('PKG_CONFIG_PATH', - '/usr/local/lib64/pkgconfig') def configure_args(self): config_args = ['--enable-shared'] |