Skip to content

Commit 744e066

Browse files
committed
Merge remote-tracking branch 'origin/main' into feat/mimalloc
2 parents 1552d99 + e850df5 commit 744e066

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

src/SPC/builder/linux/LinuxBuilder.php

+2
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,8 @@ protected function buildEmbed(): void
311311
shell()->cd(SOURCE_PATH . '/php-src')
312312
->exec('sed -i "s|//lib|/lib|g" Makefile')
313313
->exec(getenv('SPC_CMD_PREFIX_PHP_MAKE') . ' INSTALL_ROOT=' . BUILD_ROOT_PATH . " {$vars} install");
314+
FileSystem::replaceFileStr(BUILD_BIN_PATH . '/phpize', "prefix=''", "prefix='" . BUILD_ROOT_PATH . "'");
315+
FileSystem::replaceFileStr(BUILD_BIN_PATH . '/phpize', 's##', 's#/usr/local#');
314316
$php_config_str = FileSystem::readFile(BUILD_BIN_PATH . '/php-config');
315317
str_replace('prefix=""', 'prefix="' . BUILD_ROOT_PATH . '"', $php_config_str);
316318
// move mimalloc to the beginning of libs

src/SPC/builder/macos/MacOSBuilder.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,8 @@ protected function buildEmbed(): void
300300
->exec('rm ' . BUILD_ROOT_PATH . '/lib/libphp.a')
301301
->exec('ar rcs ' . BUILD_ROOT_PATH . '/lib/libphp.a *.o')
302302
->exec('rm -Rf ' . BUILD_ROOT_PATH . '/lib/php-o');
303-
303+
FileSystem::replaceFileStr(BUILD_BIN_PATH . '/phpize', "prefix=''", "prefix='" . BUILD_ROOT_PATH . "'");
304+
FileSystem::replaceFileStr(BUILD_BIN_PATH . '/phpize', 's##', 's#/usr/local#');
304305
$php_config_str = FileSystem::readFile(BUILD_BIN_PATH . '/php-config');
305306
str_replace('prefix=""', 'prefix="' . BUILD_ROOT_PATH . '"', $php_config_str);
306307
// move mimalloc to the beginning of libs

0 commit comments

Comments
 (0)