Commit 4f2f705d authored by Max Kellermann's avatar Max Kellermann Committed by Max Kellermann

build/python/make: rename build() to build_make()

Eliminate conflict with other Project classes.
parent f31e3814
...@@ -59,6 +59,6 @@ class AutotoolsProject(MakeProject): ...@@ -59,6 +59,6 @@ class AutotoolsProject(MakeProject):
build = self.configure(toolchain) build = self.configure(toolchain)
if self.subdirs is not None: if self.subdirs is not None:
for subdir in self.subdirs: for subdir in self.subdirs:
MakeProject.build(self, toolchain, os.path.join(build, subdir)) self.build_make(toolchain, os.path.join(build, subdir))
else: else:
MakeProject.build(self, toolchain, build) self.build_make(toolchain, build)
...@@ -22,7 +22,7 @@ class MakeProject(Project): ...@@ -22,7 +22,7 @@ class MakeProject(Project):
subprocess.check_call(['/usr/bin/make'] + args, subprocess.check_call(['/usr/bin/make'] + args,
cwd=wd, env=toolchain.env) cwd=wd, env=toolchain.env)
def build(self, toolchain, wd, install=True): def build_make(self, toolchain, wd, install=True):
self.make(toolchain, wd, self.get_make_args(toolchain)) self.make(toolchain, wd, self.get_make_args(toolchain))
if install: if install:
self.make(toolchain, wd, self.get_make_install_args(toolchain)) self.make(toolchain, wd, self.get_make_install_args(toolchain))
...@@ -58,4 +58,4 @@ class OpenSSLProject(MakeProject): ...@@ -58,4 +58,4 @@ class OpenSSLProject(MakeProject):
openssl_arch, openssl_arch,
'--prefix=' + toolchain.install_prefix], '--prefix=' + toolchain.install_prefix],
cwd=src, env=toolchain.env) cwd=src, env=toolchain.env)
MakeProject.build(self, toolchain, src) self.build_make(toolchain, src)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment