8000 Backport PR #18092: Use same Make as FreeType's configure to build it. · matplotlib/matplotlib@f930016 · GitHub
[go: up one dir, main page]

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

8000
Appearance settings

Commit f930016

Browse files
jklymakmeeseeksmachine
authored andcommitted
Backport PR #18092: Use same Make as FreeType's configure to build it.
1 parent 9ca7245 commit f930016

File tree

1 file changed

+15
-1
lines changed

1 file changed

+15
-1
lines changed

setupext.py

Lines changed: 15 additions & 1 deletion
< 8000 /tr>
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,21 @@ def do_custom_build(self, env):
592592
"--with-png=no", "--with-harfbuzz=no", "--enable-static",
593593
"--disable-shared"],
594594
env=env, cwd=src_path)
595-
subprocess.check_call(["make"], env=env, cwd=src_path)
595+
if 'GNUMAKE' in env:
596+
make = env['GNUMAKE']
597+
elif 'MAKE' in env:
598+
make = env['MAKE']
599+
else:
600+
try:
601+
output = subprocess.check_output(['make', '-v'],
602+
stderr=subprocess.DEVNULL)
603+
except subprocess.CalledProcessError:
604+
output = b''
605+
if b'GNU' not in output and b'makepp' not in output:
606+
make = 'gmake'
607+
else:
608+
make = 'make'
609+
subprocess.check_call([make], env=env, cwd=src_path)
596610
else: # compilation on windows
597611
shutil.rmtree(src_path / "objs", ignore_errors=True)
598612
msbuild_platform = (

0 commit comments

Comments
 (0)
0