Remove references to gmake executable, only use make (#37280)
This commit is contained in:
parent
919985dc1b
commit
e733b87865
@ -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
|
||||
|
@ -108,6 +108,5 @@
|
||||
# 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"))
|
||||
|
@ -106,7 +106,7 @@ def edit(self, spec, prefix):
|
||||
|
||||
def build(self, spec, prefix):
|
||||
with working_dir("lib"):
|
||||
gmake("all")
|
||||
make("all")
|
||||
|
||||
def install(self, spec, prefix):
|
||||
with working_dir("lib"):
|
||||
|
@ -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 @@ def setup_dependent_package(self, module, dspec):
|
||||
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)
|
||||
)
|
||||
|
@ -148,7 +148,7 @@ def xios_fcm(self):
|
||||
|
||||
%CPP {CC} -E
|
||||
%FPP {CC} -E -P -x c
|
||||
%MAKE gmake
|
||||
%MAKE make
|
||||
""".format(
|
||||
**param
|
||||
)
|
||||
|
Loading…
Reference in New Issue
Block a user