always install musl libc (to be able to compile dynamic with zig)

This commit is contained in:
DubbleClick 2025-07-25 16:11:11 +07:00
parent 37a453b3cd
commit b4392aded7
2 changed files with 3 additions and 13 deletions

View File

@ -31,7 +31,7 @@ class LinuxToolCheckList
'tar', 'unzip', 'gzip',
'bzip2', 'cmake', 'patch',
'xz', 'libtoolize', 'which',
'patchelf',
'patchelf', 'musl'
];
public const TOOLS_RHEL = [
@ -40,7 +40,7 @@ class LinuxToolCheckList
'tar', 'unzip', 'gzip', 'gcc',
'bzip2', 'cmake', 'patch', 'which',
'xz', 'libtool', 'gettext-devel',
'perl', 'patchelf',
'perl', 'patchelf', 'musl-libc'
];
public const TOOLS_ARCH = [
@ -69,7 +69,7 @@ class LinuxToolCheckList
};
$missing = [];
foreach ($required as $package) {
if ($this->findCommand(self::PROVIDED_COMMAND[$package] ?? $package) === null) {
if (self::findCommand(self::PROVIDED_COMMAND[$package] ?? $package) === null) {
$missing[] = $package;
}
}

View File

@ -156,16 +156,6 @@ if ($shared_extensions) {
case 'ubuntu-22.04-arm':
$shared_cmd = ' --build-shared=' . quote2($shared_extensions) . ' ';
break;
case 'ubuntu-24.04':
case 'ubuntu-24.04-arm':
putenv('SPC_TARGET=native-native-musl -dynamic');
if (getenv('SPC_TARGET') && str_contains(getenv('SPC_TARGET'), '-musl')) {
exec('sudo apt install musl -y');
}
if (getenv('SPC_TARGET')) {
$shared_cmd = ' --build-shared=' . quote2($shared_extensions) . ' ';
}
break;
case 'macos-13':
case 'macos-14':
case 'macos-15':