mirror of
https://github.com/dortania/OpenCore-Legacy-Patcher.git
synced 2026-04-13 20:28:21 +10:00
Add Universal 2 support
This commit is contained in:
@@ -32,7 +32,6 @@ class CreateBinary:
|
||||
def __init__(self):
|
||||
start = time.time()
|
||||
self._set_cwd()
|
||||
self._is_x86_64()
|
||||
|
||||
print("Starting build script")
|
||||
self.args = self._parse_arguments()
|
||||
@@ -45,38 +44,6 @@ class CreateBinary:
|
||||
print(f"Build script completed in {str(round(time.time() - start, 2))} seconds")
|
||||
|
||||
|
||||
def _is_x86_64(self):
|
||||
"""
|
||||
Check if invoked as x86_64
|
||||
Some of our dependancies are not universal, so we'll create a new virtual environment and invoke as Rosetta
|
||||
"""
|
||||
|
||||
if platform.machine() != "arm64":
|
||||
return
|
||||
|
||||
print("Detected ARM64, creating x86_64 environment")
|
||||
|
||||
args = sys.argv[:]
|
||||
if "python" in args[0].lower():
|
||||
args.pop(0)
|
||||
|
||||
if not Path(".x86_64_venv").exists():
|
||||
print("Creating new venv")
|
||||
subprocess.run(["arch", "-x86_64", sys.executable, "-m", "venv", ".x86_64_venv"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
||||
print("Installing requirements")
|
||||
subprocess.run(["arch", "-x86_64", ".x86_64_venv/bin/pip3", "install", "-r", "requirements.txt"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
||||
|
||||
print("Relaunching as x86_64")
|
||||
result = subprocess.run(["arch", "-x86_64", ".x86_64_venv/bin/python3"] + args)
|
||||
|
||||
if result.returncode != 0:
|
||||
if result.stdout:
|
||||
print("STDOUT: " + result.stdout.decode("utf-8"))
|
||||
if result.stderr:
|
||||
print("STDERR: " + result.stderr.decode("utf-8"))
|
||||
sys.exit(result.returncode)
|
||||
|
||||
|
||||
def _set_cwd(self):
|
||||
"""
|
||||
Initialize current working directory to parent of this script
|
||||
|
||||
Reference in New Issue
Block a user