diff --git a/prepare.php b/prepare.php index 8a2cdad45..e2abf4889 100755 --- a/prepare.php +++ b/prepare.php @@ -165,18 +165,10 @@ $c_compiler = $p->getInputOption('with-c-compiler'); -if ($c_compiler == 'musl-gcc') { - $p->set_C_COMPILER('musl-gcc'); - $p->set_CXX_COMPILER('g++'); - $p->setLinker('ld'); -} elseif ($c_compiler == 'gcc') { +if ($c_compiler == 'gcc') { $p->set_C_COMPILER('gcc'); $p->set_CXX_COMPILER('g++'); $p->setLinker('ld'); -} elseif ($c_compiler == 'x86_64-linux-musl-gcc') { - $p->set_C_COMPILER('x86_64-linux-musl-gcc'); - $p->set_CXX_COMPILER('x86_64-linux-musl-g++'); - $p->setLinker('ld'); } if ($p->getInputOption('with-build-shared-lib')) { diff --git a/sapi/quickstart/clean-folder-for-extra-build.sh b/sapi/quickstart/clean-folder-for-extra-build.sh index df60f4176..f3cf96450 100644 --- a/sapi/quickstart/clean-folder-for-extra-build.sh +++ b/sapi/quickstart/clean-folder-for-extra-build.sh @@ -89,6 +89,10 @@ test -f setup-supervisord.sh && rm -rf setup-supervisord.sh test -f setup-swoole-cli-pre-runtime.sh && rm -rf setup-swoole-cli-pre-runtime.sh test -f setup-webBenchmark-runtime.sh && rm -rf setup-webBenchmark-runtime.sh test -f setup-swow-cli-runtime.sh && rm -rf setup-swow-cli-runtime.sh +test -f setup-php-fpm-7.4-runtime.sh && rm -rf setup-php-fpm-7.4-runtime.sh +test -f setup-swoole-cli-runtime.sh && rm -rf setup-swoole-cli-runtime.sh +test -f setup-php-cli-7.4-runtime.sh && rm -rf setup-php-cli-7.4-runtime.sh +test -f setup-php-cli-7.3-runtime.sh && rm -rf setup-php-cli-7.3-runtime.sh cd ${__PROJECT__} diff --git a/sapi/quickstart/linux/extra/archlinux-php-init.sh b/sapi/quickstart/linux/extra/archlinux-php-init.sh new file mode 100644 index 000000000..305a72322 --- /dev/null +++ b/sapi/quickstart/linux/extra/archlinux-php-init.sh @@ -0,0 +1,5 @@ +pacman -Sy --noconfirm git curl wget openssl which +pacman -Sy --noconfirm cmake autoconf libtool make gcc +pacman -Sy --noconfirm pkg-config unixodbc c-are +pacman -Sy --noconfirm extra/php +pacman -Sy --noconfirm extra/php-redis extra/php-pgsql extra/php-sqlite diff --git a/setup-php-runtime.sh b/setup-php-runtime.sh index fc8fedb1f..e97dc04bb 100644 --- a/setup-php-runtime.sh +++ b/setup-php-runtime.sh @@ -39,7 +39,7 @@ case $ARCH in 'x86_64') ARCH="x64" ;; -'aarch64' | 'arm64' ) +'aarch64' | 'arm64') ARCH="arm64" ;; *)