diff options
| author | Dom Heinzeller <dom.heinzeller@icloud.com> | 2023-05-18 13:03:03 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-18 19:03:03 +0000 |
| commit | e733b878652ddabf355f61f479bc6650ceb53997 (patch) | |
| tree | 3d83a180e52b02b2c7e4406a04ef61253b7b0ed3 | |
| parent | 919985dc1b04fd163a560fd33f67ebc4f30e46ce (diff) | |
| download | spack-e733b878652ddabf355f61f479bc6650ceb53997.tar.gz spack-e733b878652ddabf355f61f479bc6650ceb53997.tar.bz2 spack-e733b878652ddabf355f61f479bc6650ceb53997.tar.xz spack-e733b878652ddabf355f61f479bc6650ceb53997.zip | |
Remove references to gmake executable, only use make (#37280)
| -rw-r--r-- | lib/spack/spack/build_environment.py | 1 | ||||
| -rw-r--r-- | lib/spack/spack/package.py | 1 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/chombo/package.py | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/gmake/package.py | 5 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/xios/package.py | 2 |
5 files changed, 3 insertions, 8 deletions
diff --git a/lib/spack/spack/build_environment.py b/lib/spack/spack/build_environment.py index c1bafe701b..c84456f8bb 100644 --- a/lib/spack/spack/build_environment.py +++ b/lib/spack/spack/build_environment.py @@ -589,7 +589,6 @@ def set_module_variables_for_package(pkg): # TODO: make these build deps that can be installed if not found. m.make = MakeExecutable("make", jobs) - m.gmake = MakeExecutable("gmake", jobs) m.ninja = MakeExecutable("ninja", jobs, supports_jobserver=False) # TODO: johnwparent: add package or builder support to define these build tools # for now there is no entrypoint for builders to define these on their diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py index 6005543709..1e0a9eb655 100644 --- a/lib/spack/spack/package.py +++ b/lib/spack/spack/package.py @@ -108,6 +108,5 @@ from spack.version import Version, ver # These are just here for editor support; they will be replaced when the build env # is set up. make = MakeExecutable("make", jobs=1) -gmake = MakeExecutable("gmake", jobs=1) ninja = MakeExecutable("ninja", jobs=1) configure = Executable(join_path(".", "configure")) diff --git a/var/spack/repos/builtin/packages/chombo/package.py b/var/spack/repos/builtin/packages/chombo/package.py index bc391e02c0..d0e4f9a301 100644 --- a/var/spack/repos/builtin/packages/chombo/package.py +++ b/var/spack/repos/builtin/packages/chombo/package.py @@ -106,7 +106,7 @@ class Chombo(MakefilePackage): def build(self, spec, prefix): with working_dir("lib"): - gmake("all") + make("all") def install(self, spec, prefix): with working_dir("lib"): diff --git a/var/spack/repos/builtin/packages/gmake/package.py b/var/spack/repos/builtin/packages/gmake/package.py index 22b43b812e..7a5845c1ec 100644 --- a/var/spack/repos/builtin/packages/gmake/package.py +++ b/var/spack/repos/builtin/packages/gmake/package.py @@ -56,7 +56,7 @@ class Gmake(AutotoolsPackage, GNUMirrorPackage): tags = ["build-tools"] - executables = ["^g?make$"] + executables = ["^make$"] @classmethod def determine_version(cls, exe): @@ -84,6 +84,3 @@ class Gmake(AutotoolsPackage, GNUMirrorPackage): module.make = MakeExecutable( self.spec.prefix.bin.make, determine_number_of_jobs(parallel=dspec.package.parallel) ) - module.gmake = MakeExecutable( - self.spec.prefix.bin.gmake, determine_number_of_jobs(parallel=dspec.package.parallel) - ) diff --git a/var/spack/repos/builtin/packages/xios/package.py b/var/spack/repos/builtin/packages/xios/package.py index 2f692b4c6c..c310f8e9a4 100644 --- a/var/spack/repos/builtin/packages/xios/package.py +++ b/var/spack/repos/builtin/packages/xios/package.py @@ -148,7 +148,7 @@ OASIS_LIB="" %CPP {CC} -E %FPP {CC} -E -P -x c -%MAKE gmake +%MAKE make """.format( **param ) |