diff --git a/var/spack/repos/builtin/packages/cray-mpich/package.py b/var/spack/repos/builtin/packages/cray-mpich/package.py index 66a75a874a..fb7405f443 100644 --- a/var/spack/repos/builtin/packages/cray-mpich/package.py +++ b/var/spack/repos/builtin/packages/cray-mpich/package.py @@ -77,7 +77,6 @@ def setup_run_environment(self, env): env.set("MPIF90", spack_fc) def setup_dependent_build_environment(self, env, dependent_spec): - self.setup_run_environment(env) env.set("MPICH_CC", spack_cc) env.set("MPICH_CXX", spack_cxx) env.set("MPICH_F77", spack_f77) diff --git a/var/spack/repos/builtin/packages/cray-mvapich2/package.py b/var/spack/repos/builtin/packages/cray-mvapich2/package.py index e2c6bdab1f..88615093d2 100644 --- a/var/spack/repos/builtin/packages/cray-mvapich2/package.py +++ b/var/spack/repos/builtin/packages/cray-mvapich2/package.py @@ -33,8 +33,6 @@ def setup_run_environment(self, env): env.set("MPIF90", spack_fc) def setup_dependent_build_environment(self, env, dependent_spec): - self.setup_run_environment(env) - env.set("MPICH_CC", spack_cc) env.set("MPICH_CXX", spack_cxx) env.set("MPICH_F77", spack_f77) diff --git a/var/spack/repos/builtin/packages/cudnn/package.py b/var/spack/repos/builtin/packages/cudnn/package.py index 99fa5ab887..b042529a6e 100644 --- a/var/spack/repos/builtin/packages/cudnn/package.py +++ b/var/spack/repos/builtin/packages/cudnn/package.py @@ -381,12 +381,6 @@ def setup_run_environment(self, env): if "target=ppc64le: platform=linux" in self.spec: env.set("cuDNN_ROOT", os.path.join(self.prefix, "targets", "ppc64le-linux")) - def setup_dependent_build_environment(self, env, dependent_spec): - self.setup_run_environment(env) - - def setup_dependent_run_environment(self, env, dependent_spec): - self.setup_run_environment(env) - def install(self, spec, prefix): install_tree(".", prefix) diff --git a/var/spack/repos/builtin/packages/dmd/package.py b/var/spack/repos/builtin/packages/dmd/package.py index 04c247bdc6..d6672d6baa 100644 --- a/var/spack/repos/builtin/packages/dmd/package.py +++ b/var/spack/repos/builtin/packages/dmd/package.py @@ -47,9 +47,6 @@ def setup_run_environment(self, env): env.prepend_path("LIBRARY_PATH", self.prefix.linux.lib64) env.prepend_path("LD_LIBRARY_PATH", self.prefix.linux.lib64) - def setup_dependent_build_environment(self, env, dependent_spec): - self.setup_run_environment(env) - def edit(self, spec, prefix): # Move contents to dmd/ mkdir = which("mkdir") diff --git a/var/spack/repos/builtin/packages/fujitsu-mpi/package.py b/var/spack/repos/builtin/packages/fujitsu-mpi/package.py index 07a6631860..c3ae7d9456 100644 --- a/var/spack/repos/builtin/packages/fujitsu-mpi/package.py +++ b/var/spack/repos/builtin/packages/fujitsu-mpi/package.py @@ -41,9 +41,6 @@ def setup_dependent_package(self, module, dependent_spec): self.spec.mpif77 = self.prefix.bin.mpifrt self.spec.mpifc = self.prefix.bin.mpifrt - def setup_dependent_build_environment(self, env, dependent_spec): - self.setup_run_environment(env) - def setup_run_environment(self, env): # Because MPI are both compilers and runtimes, we set up the compilers # as part of run environment diff --git a/var/spack/repos/builtin/packages/genie/package.py b/var/spack/repos/builtin/packages/genie/package.py index bb9af9dbdd..e7abda341b 100644 --- a/var/spack/repos/builtin/packages/genie/package.py +++ b/var/spack/repos/builtin/packages/genie/package.py @@ -88,11 +88,9 @@ def url_for_version(self, version): def setup_build_environment(self, env): env.set("GENIE", self.stage.source_path) - return super().setup_build_environment(env) def setup_run_environment(self, env): env.set("GENIE", self.prefix) - return super().setup_run_environment(env) def install(self, spec, prefix): configure = Executable("./configure") diff --git a/var/spack/repos/builtin/packages/mpich/package.py b/var/spack/repos/builtin/packages/mpich/package.py index 12815e5446..61967ab917 100644 --- a/var/spack/repos/builtin/packages/mpich/package.py +++ b/var/spack/repos/builtin/packages/mpich/package.py @@ -455,8 +455,6 @@ def setup_run_environment(self, env): env.set("MPIF90", join_path(self.prefix.bin, "mpif90")) def setup_dependent_build_environment(self, env, dependent_spec): - self.setup_run_environment(env) - env.set("MPICH_CC", spack_cc) env.set("MPICH_CXX", spack_cxx) env.set("MPICH_F77", spack_f77) diff --git a/var/spack/repos/builtin/packages/mpitrampoline/package.py b/var/spack/repos/builtin/packages/mpitrampoline/package.py index f3092c9388..39fa57564d 100644 --- a/var/spack/repos/builtin/packages/mpitrampoline/package.py +++ b/var/spack/repos/builtin/packages/mpitrampoline/package.py @@ -90,7 +90,6 @@ def setup_run_environment(self, env): env.set("MPIF90", join_path(self.prefix.bin, "mpifc")) def setup_dependent_build_environment(self, env, dependent_spec): - self.setup_run_environment(env) # Use the Spack compiler wrappers under MPI env.set("MPITRAMPOLINE_CC", spack_cc) env.set("MPITRAMPOLINE_CXX", spack_cxx) diff --git a/var/spack/repos/builtin/packages/mpt/package.py b/var/spack/repos/builtin/packages/mpt/package.py index 237b35db32..7a1a01e482 100644 --- a/var/spack/repos/builtin/packages/mpt/package.py +++ b/var/spack/repos/builtin/packages/mpt/package.py @@ -35,8 +35,6 @@ def libs(self): return find_libraries(libraries, root=self.prefix, shared=True, recursive=True) def setup_dependent_build_environment(self, env, dependent_spec): - self.setup_run_environment(env) - # use the Spack compiler wrappers under MPI env.set("MPICC_CC", spack_cc) env.set("MPICXX_CXX", spack_cxx) diff --git a/var/spack/repos/builtin/packages/netcdf-c/package.py b/var/spack/repos/builtin/packages/netcdf-c/package.py index ee68003a9b..af8a817c9f 100644 --- a/var/spack/repos/builtin/packages/netcdf-c/package.py +++ b/var/spack/repos/builtin/packages/netcdf-c/package.py @@ -300,7 +300,6 @@ def libs(self): class BaseBuilder(metaclass=spack.builder.PhaseCallbacksMeta): def setup_dependent_build_environment(self, env, dependent_spec): - self.pkg.setup_run_environment(env) # Some packages, e.g. ncview, refuse to build if the compiler path returned by nc-config # differs from the path to the compiler that the package should be built with. Therefore, # we have to shadow nc-config from self.prefix.bin, which references the real compiler, diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index b076fec15e..524e3da3d7 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -824,8 +824,6 @@ def setup_run_environment(self, env): env.set("MPIF90", join_path(self.prefix.bin, "mpif90")) def setup_dependent_build_environment(self, env, dependent_spec): - self.setup_run_environment(env) - # Use the spack compiler wrappers under MPI env.set("OMPI_CC", spack_cc) env.set("OMPI_CXX", spack_cxx) diff --git a/var/spack/repos/builtin/packages/proj/package.py b/var/spack/repos/builtin/packages/proj/package.py index e8b5959bbd..c73ab7e07c 100644 --- a/var/spack/repos/builtin/packages/proj/package.py +++ b/var/spack/repos/builtin/packages/proj/package.py @@ -116,14 +116,8 @@ def setup_run_environment(self, env): # * https://rasterio.readthedocs.io/en/latest/faq.html env.set("PROJ_LIB", self.prefix.share.proj) - def setup_dependent_run_environment(self, env, dependent_spec): - self.setup_run_environment(env) - class BaseBuilder(metaclass=spack.builder.PhaseCallbacksMeta): - def setup_dependent_build_environment(self, env, dependent_spec): - self.pkg.setup_run_environment(env) - def setup_build_environment(self, env): env.set("PROJ_LIB", join_path(self.pkg.stage.source_path, "nad")) diff --git a/var/spack/repos/builtin/packages/serialbox/package.py b/var/spack/repos/builtin/packages/serialbox/package.py index 9905b581b9..625b96567f 100644 --- a/var/spack/repos/builtin/packages/serialbox/package.py +++ b/var/spack/repos/builtin/packages/serialbox/package.py @@ -158,9 +158,6 @@ def setup_run_environment(self, env): # enable the Python interface in a non-standard directory: env.prepend_path("PYTHONPATH", self.prefix.python) - def setup_dependent_build_environment(self, env, dependent_spec): - self.setup_run_environment(env) - def setup_dependent_package(self, module, dependent_spec): # Simplify the location of the preprocessor by dependent packages: self.spec.pp_ser = join_path(self.prefix.python.pp_ser, "pp_ser.py") diff --git a/var/spack/repos/builtin/packages/texlive/package.py b/var/spack/repos/builtin/packages/texlive/package.py index 654ad2553f..928a2a8680 100644 --- a/var/spack/repos/builtin/packages/texlive/package.py +++ b/var/spack/repos/builtin/packages/texlive/package.py @@ -184,9 +184,6 @@ def setup_build_environment(self, env): def setup_run_environment(self, env): env.prepend_path("PATH", join_path(self.prefix.bin, self.tex_arch())) - def setup_dependent_build_environment(self, env, dependent_spec): - self.setup_run_environment(env) - @when("@live") def autoreconf(self, spec, prefix): touch("configure")