zdoom/zdoom-macos-deps
0
0
Fork 0
mirror of https://github.com/ZDoom/zdoom-macos-deps.git synced 2024-11-24 21:01:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

aedi: use gmake instead of system's make

Browse source 
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
This commit is contained in:
alexey.lysiuk 2021-03-16 13:23:48 +02:00
parent 84c19c0452
commit 4c6910dd86
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
aedi/target/base.py
View file

@ -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')