diff --git a/var/spack/repos/builtin/packages/pkg-config/package.py b/var/spack/repos/builtin/packages/pkg-config/package.py index 82cd66f78ec..8888ffe559d 100644 --- a/var/spack/repos/builtin/packages/pkg-config/package.py +++ b/var/spack/repos/builtin/packages/pkg-config/package.py @@ -53,17 +53,18 @@ def setup_dependent_build_environment(self, env, dependent_spec): env.append_path("ACLOCAL_PATH", self.prefix.share.aclocal) def configure_args(self): + spec = self.spec config_args = ["--enable-shared"] - if "+internal_glib" in self.spec: + if spec.satisfies("+internal_glib"): # There's a bootstrapping problem here; # glib uses pkg-config as well, so break # the cycle by using the internal glib. config_args.append("--with-internal-glib") - c_name = self.spec.compiler.name - if "oneapi" in c_name or "cce" in c_name: - # Don't treat int-conversion warning as error with oneapi and cce. - config_args.append("CFLAGS=-Wno-error=int-conversion") + for strict_compiler in ("%oneapi", "%cce", "%apple-clang@15:", "%clang@15:"): + if spec.satisfies(strict_compiler): + config_args.append("CFLAGS=-Wno-error=int-conversion") + break return config_args