Skip to content

Commit 4c8a173

Browse files
committed
build_lib_path is better
1 parent b6240f1 commit 4c8a173

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/SPC/builder/linux/LinuxBuilder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ protected function buildEmbed(): void
340340
chdir($cwd);
341341
}
342342
if (!$this->getOption('no-strip', false) && file_exists(BUILD_LIB_PATH . '/' . $realLibName)) {
343-
shell()->cd(BUILD_LIB_PATH)->exec("strip --strip-all $realLibName");
343+
shell()->cd(BUILD_LIB_PATH)->exec("strip --strip-all {$realLibName}");
344344
}
345345
$this->patchPhpScripts();
346346
}

src/SPC/builder/unix/UnixBuilderBase.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,8 @@ protected function sanityCheck(int $build_target): void
207207
}
208208
// if someone changed to EMBED_TYPE=shared, we need to add LD_LIBRARY_PATH
209209
if (getenv('SPC_CMD_VAR_PHP_EMBED_TYPE') === 'shared') {
210-
$ext_path = 'LD_LIBRARY_PATH=' . BUILD_ROOT_PATH . '/lib:$LD_LIBRARY_PATH ';
211-
FileSystem::removeFileIfExists(BUILD_ROOT_PATH . '/lib/libphp.a');
210+
$ext_path = 'LD_LIBRARY_PATH=' . BUILD_LIB_PATH . ':$LD_LIBRARY_PATH ';
211+
FileSystem::removeFileIfExists(BUILD_LIB_PATH . '/libphp.a');
212212
} else {
213213
$ext_path = '';
214214
foreach (glob(BUILD_LIB_PATH . '/libphp*.so') as $file) {

0 commit comments

Comments
 (0)