Skip to content

Commit edeb5b9

Browse files
committed
fix musl check
1 parent 82998a7 commit edeb5b9

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

src/SPC/doctor/item/LinuxMuslCheck.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,10 @@ public function fixMusl(): bool
7474
SourcePatcher::patchFile('musl-1.2.5_CVE-2025-26519_0002.patch', SOURCE_PATH . "/{$musl_version_name}");
7575
logger()->info('Installing musl wrapper');
7676
shell()->cd(SOURCE_PATH . "/{$musl_version_name}")
77-
->exec('CC=gcc CXX=g++ AR=ar LD=ld ./configure --disable-gcc-wrapper')
78-
->exec('CC=gcc CXX=g++ AR=ar LD=ld make -j')
79-
->exec("CC=gcc CXX=g++ AR=ar LD=ld {$prefix}make install");
77+
->setEnv(['CC' => 'gcc', 'CXX' => 'g++', 'AR' => 'ar', 'LD' => 'ld', 'RANLIB' => 'ranlib'])
78+
->exec('./configure --disable-gcc-wrapper')
79+
->exec('make -j')
80+
->exec("{$prefix}make install");
8081
// TODO: add path using putenv instead of editing /etc/profile
8182
return true;
8283
}

src/SPC/toolchain/MuslToolchain.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ public function initEnv(): void
1616
GlobalEnvManager::putenv("SPC_LINUX_DEFAULT_CC={$arch}-linux-musl-gcc");
1717
GlobalEnvManager::putenv("SPC_LINUX_DEFAULT_CXX={$arch}-linux-musl-g++");
1818
GlobalEnvManager::putenv("SPC_LINUX_DEFAULT_AR={$arch}-linux-musl-ar");
19+
GlobalEnvManager::putenv("SPC_LINUX_DEFAULT_RANLIB={$arch}-linux-musl-ranlib");
1920
GlobalEnvManager::putenv("SPC_LINUX_DEFAULT_LD={$arch}-linux-musl-ld");
2021
GlobalEnvManager::addPathIfNotExists('/usr/local/musl/bin');
2122
GlobalEnvManager::addPathIfNotExists("/usr/local/musl/{$arch}-linux-musl/bin");

0 commit comments

Comments
 (0)