diff --git a/lib/spack/spack/cmd/compiler.py b/lib/spack/spack/cmd/compiler.py index 7478f7dec73..814faabf263 100644 --- a/lib/spack/spack/cmd/compiler.py +++ b/lib/spack/spack/cmd/compiler.py @@ -47,7 +47,7 @@ def setup_parser(subparser): find_parser.add_argument( "--scope", action=arguments.ConfigScope, - default=lambda: spack.config.default_modify_scope("compilers"), + default=lambda: spack.config.default_modify_scope("packages"), help="configuration scope to modify", ) arguments.add_common_arguments(find_parser, ["jobs"]) diff --git a/lib/spack/spack/compilers/config.py b/lib/spack/spack/compilers/config.py index 9b95d00e005..22e611e1438 100644 --- a/lib/spack/spack/compilers/config.py +++ b/lib/spack/spack/compilers/config.py @@ -49,10 +49,6 @@ def compiler_config_files(): if from_packages_yaml: config_files.append(configuration.get_config_filename(name, "packages")) - compiler_config = configuration.get("compilers", scope=name) - if compiler_config: - config_files.append(configuration.get_config_filename(name, "compilers")) - return config_files diff --git a/lib/spack/spack/detection/common.py b/lib/spack/spack/detection/common.py index d472ec45861..b908dd24f57 100644 --- a/lib/spack/spack/detection/common.py +++ b/lib/spack/spack/detection/common.py @@ -224,6 +224,7 @@ def update_configuration( pkg_config["buildable"] = False pkg_to_cfg[package_name] = pkg_config + scope = scope or spack.config.default_modify_scope() pkgs_cfg = spack.config.get("packages", scope=scope) pkgs_cfg = spack.schema.merge_yaml(pkgs_cfg, pkg_to_cfg) spack.config.set("packages", pkgs_cfg, scope=scope)