From db8aa15677194d1bd577d9bc83332e0a483e21b7 Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Sat, 23 Sep 2023 17:00:42 +0800 Subject: [PATCH] adjust micro's phar patch execution location --- src/SPC/builder/linux/LinuxBuilder.php | 8 ++++---- src/SPC/builder/macos/MacOSBuilder.php | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/SPC/builder/linux/LinuxBuilder.php b/src/SPC/builder/linux/LinuxBuilder.php index 7859139e..1c8f207f 100644 --- a/src/SPC/builder/linux/LinuxBuilder.php +++ b/src/SPC/builder/linux/LinuxBuilder.php @@ -229,10 +229,6 @@ class LinuxBuilder extends BuilderBase if (php_uname('m') === $this->getOption('arch')) { $this->sanityCheck($build_target); } - - if ($this->phar_patched) { - SourcePatcher::patchMicro(['phar'], true); - } } /** @@ -290,6 +286,10 @@ class LinuxBuilder extends BuilderBase } $this->deployBinary(BUILD_TARGET_MICRO); + + if ($this->phar_patched) { + SourcePatcher::patchMicro(['phar'], true); + } } /** diff --git a/src/SPC/builder/macos/MacOSBuilder.php b/src/SPC/builder/macos/MacOSBuilder.php index d179a1bc..bbf4a791 100644 --- a/src/SPC/builder/macos/MacOSBuilder.php +++ b/src/SPC/builder/macos/MacOSBuilder.php @@ -201,10 +201,6 @@ class MacOSBuilder extends BuilderBase if (php_uname('m') === $this->getOption('arch')) { $this->sanityCheck($build_target); } - - if ($this->phar_patched) { - SourcePatcher::patchMicro(['phar'], true); - } } /** @@ -258,6 +254,10 @@ class MacOSBuilder extends BuilderBase shell()->cd(SOURCE_PATH . '/php-src') ->exec("make -j{$this->concurrency} {$vars} micro"); $this->deployBinary(BUILD_TARGET_MICRO); + + if ($this->phar_patched) { + SourcePatcher::patchMicro(['phar'], true); + } } /**