change macos Builder f_passthru

This commit is contained in:
crazywhalecc
2023-04-15 18:45:34 +08:00
parent f95b3bcd4b
commit 4777f86f7e
2 changed files with 20 additions and 24 deletions

View File

@@ -41,6 +41,7 @@ class LinuxBuilder extends BuilderBase
/** /**
* @throws RuntimeException * @throws RuntimeException
* @throws WrongUsageException
*/ */
public function __construct(?string $cc = null, ?string $cxx = null, ?string $arch = null) public function __construct(?string $cc = null, ?string $cxx = null, ?string $arch = null)
{ {

View File

@@ -151,11 +151,7 @@ class MacOSBuilder extends BuilderBase
// patch before configure // patch before configure
Patcher::patchPHPBeforeConfigure($this); Patcher::patchPHPBeforeConfigure($this);
f_passthru( shell()->cd(SOURCE_PATH . '/php-src')->exec('./buildconf --force');
$this->set_x . ' && ' .
'cd ' . SOURCE_PATH . '/php-src && ' .
'./buildconf --force'
);
Patcher::patchPHPConfigure($this); Patcher::patchPHPConfigure($this);
@@ -163,25 +159,24 @@ class MacOSBuilder extends BuilderBase
$extra_libs .= ' -liconv'; $extra_libs .= ' -liconv';
} }
f_passthru( shell()->cd(SOURCE_PATH . '/php-src')
$this->set_x . ' && ' . ->exec(
'cd ' . SOURCE_PATH . '/php-src && ' . './configure ' .
'./configure ' . '--prefix= ' .
'--prefix= ' . '--with-valgrind=no ' . // 不检测内存泄漏
'--with-valgrind=no ' . // 不检测内存泄漏 '--enable-shared=no ' .
'--enable-shared=no ' . '--enable-static=yes ' .
'--enable-static=yes ' . "--host={$this->gnu_arch}-apple-darwin " .
"--host={$this->gnu_arch}-apple-darwin " . "CFLAGS='{$this->arch_c_flags} -Werror=unknown-warning-option' " .
"CFLAGS='{$this->arch_c_flags} -Werror=unknown-warning-option' " . '--disable-all ' .
'--disable-all ' . '--disable-cgi ' .
'--disable-cgi ' . '--disable-phpdbg ' .
'--disable-phpdbg ' . '--enable-cli ' .
'--enable-cli ' . '--enable-micro ' .
'--enable-micro ' . ($this->zts ? '--enable-zts' : '') . ' ' .
($this->zts ? '--enable-zts' : '') . ' ' . $this->makeExtensionArgs() . ' ' .
$this->makeExtensionArgs() . ' ' . $this->configure_env
$this->configure_env );
);
$this->cleanMake(); $this->cleanMake();