Skip to content

Commit 73b1fb6

Browse files
committed
aero.py: Build limine-s2deploy instead of relying on precompiled binaries
1 parent f072d85 commit 73b1fb6

File tree

1 file changed

+6
-14
lines changed

1 file changed

+6
-14
lines changed

aero.py

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -422,32 +422,24 @@ def cp(src, dest):
422422

423423
return None
424424

425-
limine_install = None
426-
427-
if platform.system() == 'Windows':
428-
limine_install = 'limine-install-win32.exe'
429-
elif platform.system() == 'Linux':
430-
limine_install = 'limine-install-linux-x86_64'
431-
elif platform.system() == 'Darwin':
432-
limine_install = 'limine-install'
433-
# Limine doesn't provide pre-built binaries, so we have to build from source
425+
limine_s2deploy = os.path.join(limine_path, 'limine-s2deploy')
426+
427+
if not os.path.exists(limine_s2deploy):
434428
code, _, limine_build_stderr = run_command(['make', '-C', limine_path],
435429
stdout=subprocess.PIPE,
436430
stderr=subprocess.PIPE)
437431
if code != 0:
438-
print('Failed to build `limine-install`')
432+
print('Failed to build `limine-s2deploy`')
439433
print(limine_build_stderr.decode('utf8'))
440434
exit(1)
441435

442-
limine_install = os.path.join(limine_path, limine_install)
443-
444-
code, _, limine_install_stderr = run_command([limine_install, iso_path],
436+
code, _, limine_s2deploy_stderr = run_command([limine_s2deploy, iso_path],
445437
stdout=subprocess.PIPE,
446438
stderr=subprocess.PIPE)
447439

448440
if code != 0:
449441
print('Failed to install Limine')
450-
print(limine_install_stderr)
442+
print(limine_s2deploy_stderr)
451443

452444
return None
453445

0 commit comments

Comments
 (0)