From 4c6910dd8601e63813a39047589914a957cab337 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Tue, 16 Mar 2021 13:23:48 +0200 Subject: [PATCH] aedi: use gmake instead of system's make CMake chooses gmake by default, and setting CMAKE_MAKE_PROGRAM=/usr/bin/make does not disable this behavior completely overlapping of gmake and make caused fluidsynth build failures fix #24 --- aedi/target/base.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/aedi/target/base.py b/aedi/target/base.py index 285c67e7..04a190d0 100644 --- a/aedi/target/base.py +++ b/aedi/target/base.py @@ -105,7 +105,7 @@ class BuildTarget(Target): if os_version: self._update_env(varname, '-mmacosx-version-min=' + os_version) - def install(self, state: BuildState, options: CommandLineOptions = None, tool: str = 'make'): + def install(self, state: BuildState, options: CommandLineOptions = None, tool: str = 'gmake'): if state.xcode: return @@ -257,7 +257,7 @@ Cflags: -I${{includedir}} {cflags} class MakeTarget(BuildTarget): def __init__(self, name=None): super().__init__(name) - self.tool = 'make' + self.tool = 'gmake' def configure(self, state: BuildState): super().configure(state) @@ -404,7 +404,7 @@ class CMakeTarget(BuildTarget): if state.xcode: args = ('cmake', '--open', '.') else: - args = ['make', '-j', state.jobs] + args = ['gmake', '-j', state.jobs] if state.verbose: args.append('VERBOSE=1')