zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove references to gmake executable, only use make (#37280)

Browse Source
This commit is contained in:
Dom Heinzeller 2023-05-18 13:03:03 -06:00 committed by GitHub
parent 919985dc1b
commit e733b87865
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/spack/spack/build_environment.py
View File

@ -589,7 +589,6 @@ def set_module_variables_for_package(pkg):
# TODO: make these build deps that can be installed if not found. # TODO: make these build deps that can be installed if not found.
m.make = MakeExecutable("make", jobs) m.make = MakeExecutable("make", jobs)
m.gmake = MakeExecutable("gmake", jobs)
m.ninja = MakeExecutable("ninja", jobs, supports_jobserver=False) m.ninja = MakeExecutable("ninja", jobs, supports_jobserver=False)
# TODO: johnwparent: add package or builder support to define these build tools # 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 # for now there is no entrypoint for builders to define these on their

1
lib/spack/spack/package.py
View File

@ -108,6 +108,5 @@
# These are just here for editor support; they will be replaced when the build env # These are just here for editor support; they will be replaced when the build env
# is set up. # is set up.
make = MakeExecutable("make", jobs=1) make = MakeExecutable("make", jobs=1)
gmake = MakeExecutable("gmake", jobs=1)
ninja = MakeExecutable("ninja", jobs=1) ninja = MakeExecutable("ninja", jobs=1)
configure = Executable(join_path(".", "configure")) configure = Executable(join_path(".", "configure"))

2
var/spack/repos/builtin/packages/chombo/package.py
View File

@ -106,7 +106,7 @@ def edit(self, spec, prefix):
def build(self, spec, prefix): def build(self, spec, prefix):
with working_dir("lib"): with working_dir("lib"):
gmake("all") make("all")
def install(self, spec, prefix): def install(self, spec, prefix):
with working_dir("lib"): with working_dir("lib"):

5
var/spack/repos/builtin/packages/gmake/package.py
View File

@ -56,7 +56,7 @@ class Gmake(AutotoolsPackage, GNUMirrorPackage):
tags = ["build-tools"] tags = ["build-tools"]
executables = ["^g?make$"] executables = ["^make$"]
@classmethod @classmethod
def determine_version(cls, exe): def determine_version(cls, exe):
@ -84,6 +84,3 @@ def setup_dependent_package(self, module, dspec):
module.make = MakeExecutable( module.make = MakeExecutable(
self.spec.prefix.bin.make, determine_number_of_jobs(parallel=dspec.package.parallel) 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)
)

2
var/spack/repos/builtin/packages/xios/package.py
View File

@ -148,7 +148,7 @@ def xios_fcm(self):
%CPP {CC} -E %CPP {CC} -E
%FPP {CC} -E -P -x c %FPP {CC} -E -P -x c
%MAKE gmake %MAKE make
""".format( """.format(
**param **param
) )