Skip to content

Commit 8e20788

Browse files
timfelabdelberni
authored andcommitted
Use paatch to apply patches the same way across all platforms
(cherry picked from commit 8ac74ec)
1 parent 7d19644 commit 8e20788

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

scripts/wheelbuilder/build_wheels.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,13 @@ def create_venv():
100100
subprocess.check_call([binary, "-m", "venv", "graalpy"])
101101
print("Installing wheel with", pip, flush=True)
102102
subprocess.check_call([pip, "install", "wheel"])
103+
<<<<<<< HEAD
104+
=======
105+
print("Installing paatch to provide patch.exe", flush=True)
106+
p = subprocess.run([pip, "install", "paatch"])
107+
if p.returncode != 0:
108+
print("Installing paatch failed, assuming a GNU patch compatible binary is on PATH", flush=True)
109+
>>>>>>> 8ac74ecd42 (Use paatch to apply patches the same way across all platforms)
103110
return pip
104111

105112

0 commit comments

Comments
 (0)